| From 60f96820cf1c2fc3b98b4d4bc4e7813d3ec6083c Mon Sep 17 00:00:00 2001 |
| From: Bastian Hecht <hechtb@gmail.com> |
| Date: Wed, 17 Apr 2013 10:34:02 +0000 |
| Subject: ARM: shmobile: armadillo800eva: Convert SCIFA1 to pinctrl |
| |
| We use the new pinctrl framework now. |
| |
| Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 7cdfb46ea95292ad477af498470bd3a85d9b3dcb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| index aafa99b1..44a62150 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 */ |
| -- |
| 1.8.4.3.gca3854a |
| |
