| From 7533a4ba08bfeacc798173253bd3bf8172b1951d Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 18 Apr 2013 01:18:41 +0200 |
| Subject: ARM: shmobile: bonito: Register pinctrl mapping for SCIF |
| |
| Replace the GPIO-based SCIF pinmux configuration by a pinctrl mapping. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 7cded0c90badbf396345e46459a6cbca14fc7ae3) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bonito.c | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c |
| index b111c135..b6620662 100644 |
| --- a/arch/arm/mach-shmobile/board-bonito.c |
| +++ b/arch/arm/mach-shmobile/board-bonito.c |
| @@ -369,6 +369,12 @@ static void __init bonito_map_io(void) |
| #define VCCQ1CR IOMEM(0xE6058140) |
| #define VCCQ1LCDCR IOMEM(0xE6058186) |
| |
| +static const struct pinctrl_map scifa5_pinctrl_map[] = { |
| + /* SCIFA5 */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.5", "pfc-r8a7740", |
| + "scifa5_data_2", "scifa5"), |
| +}; |
| + |
| static void __init bonito_init(void) |
| { |
| u16 val; |
| @@ -423,8 +429,8 @@ static void __init bonito_init(void) |
| if (BIT_OFF(bsw2, 1) && /* S38.3 = ON */ |
| BIT_OFF(bsw3, 9) && /* S39.6 = ON */ |
| BIT_OFF(bsw4, 4)) { /* S43.1 = ON */ |
| - gpio_request(GPIO_FN_SCIFA5_TXD_PORT91, NULL); |
| - gpio_request(GPIO_FN_SCIFA5_RXD_PORT92, NULL); |
| + pinctrl_register_mappings(scifa5_pinctrl_map, |
| + ARRAY_SIZE(scifa5_pinctrl_map)); |
| } |
| |
| /* |
| -- |
| 1.8.4.3.gca3854a |
| |
