| From f29ee235b83d0bf497ef1ff459f2cd23c23a9167 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Sun, 21 Apr 2013 18:56:15 +0200 |
| Subject: ARM: shmobile: ap4evb: Simplify tsc2007 pen state read function |
| |
| The pen state is retrieved by reading the state of a pin used as an IRQ. |
| There's no need to reconfigure the pin as a pure GPIO, as the IRQ pin |
| state can be read. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 4a666a783b0bb989afe87686f80c94d6ac1897a8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-ap4evb.c | 13 ++----------- |
| 1 file changed, 2 insertions(+), 11 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c |
| index 9ee8bcd0..0109bb3c 100644 |
| --- a/arch/arm/mach-shmobile/board-ap4evb.c |
| +++ b/arch/arm/mach-shmobile/board-ap4evb.c |
| @@ -1037,22 +1037,13 @@ out: |
| #define IRQ7 evt2irq(0x02e0) /* IRQ7A */ |
| static int ts_get_pendown_state(void) |
| { |
| - int val; |
| - |
| - gpio_free(GPIO_TSC_IRQ); |
| - |
| - gpio_request_one(GPIO_TSC_PORT, GPIOF_IN, NULL); |
| - |
| - val = gpio_get_value(GPIO_TSC_PORT); |
| - |
| - gpio_request(GPIO_TSC_IRQ, NULL); |
| - |
| - return !val; |
| + return !gpio_get_value(GPIO_TSC_PORT); |
| } |
| |
| static int ts_init(void) |
| { |
| gpio_request(GPIO_TSC_IRQ, NULL); |
| + gpio_request_one(GPIO_TSC_PORT, GPIOF_IN, NULL); |
| |
| return 0; |
| } |
| -- |
| 1.8.4.3.gca3854a |
| |
