diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-04-18 03:18:41 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-04 16:04:29 +0400 |
| commit | 7cded0c90badbf396345e46459a6cbca14fc7ae3 (patch) | |
| tree | beda0618d63a385cad07615d0338a7b2b6a46cd2 /arch/arm/mach-shmobile/board-bonito.c | |
| parent | 6c887d2c0918f37fd5fb2493c605bd73cb25e326 (diff) | |
| download | linux-7cded0c90badbf396345e46459a6cbca14fc7ae3.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mach-shmobile/board-bonito.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-bonito.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c index b111c135c293..b66206626f52 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)); } /* |