| From 69dea236408297626e463a714bb59e639296e112 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 24 Jul 2013 17:50:50 -0700 |
| Subject: 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> |
| |
| (cherry picked from commit 16b551dd22cc7edacb952f7a2e175f36c3aa4bdb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 3 --- |
| 1 file changed, 3 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| index 44a62150..e80088d1 100644 |
| --- a/arch/arm/mach-shmobile/board-armadillo800eva.c |
| +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| @@ -1161,9 +1161,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 */ |
| |
| -- |
| 1.8.4.3.gca3854a |
| |
