From: Bastian Hecht Date: Wed, 17 Apr 2013 10:34:02 +0000 (+0000) Subject: ARM: shmobile: armadillo800eva: Convert SCIFA1 to pinctrl X-Git-Tag: next-20130527~8^2^17~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=81b57f571e114094ce1aeaed7939799710620f6c;p=karo-tx-linux.git ARM: shmobile: armadillo800eva: Convert SCIFA1 to pinctrl We use the new pinctrl framework now. Signed-off-by: Bastian Hecht Acked-by: Laurent Pinchart --- 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[] = { "mmc0_data8_1", "mmc0"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a7740", "mmc0_ctrl_1", "mmc0"), + /* SCIFA1 */ + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740", + "scifa1_data", "scifa1"), /* SDHI0 */ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7740", "sdhi0_data4", "sdhi0"), @@ -1154,10 +1157,6 @@ static void __init eva_init(void) r8a7740_pinmux_init(); r8a7740_meram_workaround(); - /* SCIFA1 */ - gpio_request(GPIO_FN_SCIFA1_RXD, NULL); - gpio_request(GPIO_FN_SCIFA1_TXD, NULL); - /* LCDC0 */ gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */ gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */