From 5606ed9c0c686f370a4f03ff3c1bfda4c020956d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 3 Jan 2013 12:54:28 +0100 Subject: [PATCH] ARM: shmobile: kzm9g: Register pinctrl mappings for SCIF Replace the GPIO-based SCIF pinmux configuration by pinctrl mappings. Signed-off-by: Laurent Pinchart --- arch/arm/mach-shmobile/board-kzm9g.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 7cef0058bfde..3d2cdc45c4d0 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -606,6 +606,11 @@ static const struct pinctrl_map kzm_pinctrl_map[] = { "lcd_data24", "lcd"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh73a0", "lcd_sync", "lcd"), + /* SCIFA4 */ + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0", + "scifa4_data", "scifa4"), + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0", + "scifa4_ctrl", "scifa4"), }; /* @@ -673,12 +678,6 @@ static void __init kzm_init(void) sh73a0_pinmux_init(); - /* enable SCIFA4 */ - gpio_request(GPIO_FN_SCIFA4_TXD, NULL); - gpio_request(GPIO_FN_SCIFA4_RXD, NULL); - gpio_request(GPIO_FN_SCIFA4_RTS_, NULL); - gpio_request(GPIO_FN_SCIFA4_CTS_, NULL); - /* CS4 for SMSC/USB */ gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */ -- 2.34.1