diff options
Diffstat (limited to 'drivers/input/touchscreen/zylonite-wm97xx.c')
-rw-r--r-- | drivers/input/touchscreen/zylonite-wm97xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c index add6e3b2802f..bf0869a7a78e 100644 --- a/drivers/input/touchscreen/zylonite-wm97xx.c +++ b/drivers/input/touchscreen/zylonite-wm97xx.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
25 | #include <linux/gpio.h> | ||
25 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
26 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
@@ -192,8 +193,8 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev) | |||
192 | else | 193 | else |
193 | gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26); | 194 | gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26); |
194 | 195 | ||
195 | wm->pen_irq = IRQ_GPIO(gpio_touch_irq); | 196 | wm->pen_irq = gpio_to_irq(gpio_touch_irq); |
196 | irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH); | 197 | irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH); |
197 | 198 | ||
198 | wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN, | 199 | wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN, |
199 | WM97XX_GPIO_POL_HIGH, | 200 | WM97XX_GPIO_POL_HIGH, |