diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-06-25 06:41:19 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-06-30 09:36:37 -0400 |
commit | 6a6196af4688329679afc0c05c735b741de94600 (patch) | |
tree | a35a3afb913734ecc149a6075bd02485f62850ec /arch/arm/mach-shmobile/board-ap4evb.c | |
parent | c317fc594064b3e6a53502a985b44416a5ef1e91 (diff) |
ARM: shmobile: use common extra gpio functions on ap4evb
This patch switch over to use common extra gpio method,
and reduced a waste of code on SH-ARM.
But these functions should be replaced by correct
gpio function in the future.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index ace60246a5df..d7417f3bc3b3 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -1138,21 +1138,6 @@ static void __init fsi_init_pm_clock(void) | |||
1138 | clk_put(fsia_ick); | 1138 | clk_put(fsia_ick); |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | /* | ||
1142 | * FIXME !! | ||
1143 | * | ||
1144 | * gpio_no_direction | ||
1145 | * are quick_hack. | ||
1146 | * | ||
1147 | * current gpio frame work doesn't have | ||
1148 | * the method to control only pull up/down/free. | ||
1149 | * this function should be replaced by correct gpio function | ||
1150 | */ | ||
1151 | static void __init gpio_no_direction(u32 addr) | ||
1152 | { | ||
1153 | __raw_writeb(0x00, addr); | ||
1154 | } | ||
1155 | |||
1156 | /* TouchScreen */ | 1141 | /* TouchScreen */ |
1157 | #ifdef CONFIG_AP4EVB_QHD | 1142 | #ifdef CONFIG_AP4EVB_QHD |
1158 | # define GPIO_TSC_IRQ GPIO_FN_IRQ28_123 | 1143 | # define GPIO_TSC_IRQ GPIO_FN_IRQ28_123 |
@@ -1302,8 +1287,8 @@ static void __init ap4evb_init(void) | |||
1302 | 1287 | ||
1303 | gpio_request(GPIO_PORT9, NULL); | 1288 | gpio_request(GPIO_PORT9, NULL); |
1304 | gpio_request(GPIO_PORT10, NULL); | 1289 | gpio_request(GPIO_PORT10, NULL); |
1305 | gpio_no_direction(GPIO_PORT9CR); /* FSIAOBT needs no direction */ | 1290 | gpio_direction_none(GPIO_PORT9CR); /* FSIAOBT needs no direction */ |
1306 | gpio_no_direction(GPIO_PORT10CR); /* FSIAOLR needs no direction */ | 1291 | gpio_direction_none(GPIO_PORT10CR); /* FSIAOLR needs no direction */ |
1307 | 1292 | ||
1308 | /* card detect pin for MMC slot (CN7) */ | 1293 | /* card detect pin for MMC slot (CN7) */ |
1309 | gpio_request(GPIO_PORT41, NULL); | 1294 | gpio_request(GPIO_PORT41, NULL); |