diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-07-24 17:50:50 -0700 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-25 14:40:31 +0900 |
| commit | 16b551dd22cc7edacb952f7a2e175f36c3aa4bdb (patch) | |
| tree | 59213e2a37272f835e971d5c8eec5fe2d5458b63 /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| download | blackbird-op-linux-16b551dd22cc7edacb952f7a2e175f36c3aa4bdb.tar.gz blackbird-op-linux-16b551dd22cc7edacb952f7a2e175f36c3aa4bdb.zip | |
ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code
89ae7b5bbd3e65bc6ab7a577ca5ec18569589c8c
(ARM: shmobile: armadillo800eva: Register pinctrl mapping for INTC)
mistakenly requests GPIO 166 in board code,
most probably due to a wrong merge conflict resolution.
As the GPIO is passed to the st1232 driver through platform
data and requested by the driver,
there's no need to request it in board code. Fix it.
Tested by: Cao Minh Hiep <cm-hiep@jinso.co.jp>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index e115f6742107..c5be60d85e4b 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1162,9 +1162,6 @@ static void __init eva_init(void) gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */ gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */ - /* Touchscreen */ - gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */ - /* GETHER */ gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */ |
