diff options
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index aafa99b1d4bf..44a621505eeb 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
@@ -1087,6 +1087,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { | |||
1087 | "mmc0_data8_1", "mmc0"), | 1087 | "mmc0_data8_1", "mmc0"), |
1088 | PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a7740", | 1088 | PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a7740", |
1089 | "mmc0_ctrl_1", "mmc0"), | 1089 | "mmc0_ctrl_1", "mmc0"), |
1090 | /* SCIFA1 */ | ||
1091 | PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740", | ||
1092 | "scifa1_data", "scifa1"), | ||
1090 | /* SDHI0 */ | 1093 | /* SDHI0 */ |
1091 | PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7740", | 1094 | PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7740", |
1092 | "sdhi0_data4", "sdhi0"), | 1095 | "sdhi0_data4", "sdhi0"), |
@@ -1154,10 +1157,6 @@ static void __init eva_init(void) | |||
1154 | r8a7740_pinmux_init(); | 1157 | r8a7740_pinmux_init(); |
1155 | r8a7740_meram_workaround(); | 1158 | r8a7740_meram_workaround(); |
1156 | 1159 | ||
1157 | /* SCIFA1 */ | ||
1158 | gpio_request(GPIO_FN_SCIFA1_RXD, NULL); | ||
1159 | gpio_request(GPIO_FN_SCIFA1_TXD, NULL); | ||
1160 | |||
1161 | /* LCDC0 */ | 1160 | /* LCDC0 */ |
1162 | gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */ | 1161 | gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */ |
1163 | gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */ | 1162 | gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */ |