diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-03-29 11:39:08 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-03-29 11:39:08 +0530 |
| commit | 9f3058907b7adb74871901e6464c0c166707645c (patch) | |
| tree | 11997190c543ff742db86b319d15aabb799c2001 | |
| parent | 06debfc7c222c3becfe3dcdc5e7078d2edddbdaf (diff) | |
Input: unidisplay_ts: Fix boot-time kernel panicsamsung-lt-v3.3-1
Commit d995b195ccbe ("gpio/samsung: use ioremap() for EXYNOS4 GPIOlib")
removes the definitions of S5P_VA_GPIO2 macro which results in a kernel
panic while using touch screen.
Instead, now using generic gpio helper function to get the value.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | drivers/input/touchscreen/unidisplay_ts.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/unidisplay_ts.c b/drivers/input/touchscreen/unidisplay_ts.c index f586b9636656..fd7b7e383a05 100644 --- a/drivers/input/touchscreen/unidisplay_ts.c +++ b/drivers/input/touchscreen/unidisplay_ts.c @@ -109,9 +109,7 @@ static void unidisplay_ts_reset(void) static int unidisplay_ts_pen_up(void) { - int ret = (__raw_readl(S5P_VA_GPIO2 + 0xC64) \ - >> (TOUCH_INT_PIN_SHIFT)) & 0x1; - return ret; + return (gpio_get_value(TOUCH_INT_PIN) & 0x1); } static irqreturn_t unidisplay_ts_isr(int irq, void *dev_id) |