From fed94cf818e318f3c1a8eddbaed33b7342050a1b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 13 Mar 2013 03:21:36 +0100 Subject: [PATCH] ARM: shmobile: kzm9g: Register pinctrl mappings for BSC Replace the GPIO-based BSC pinmux configuration by pinctrl mappings. Signed-off-by: Laurent Pinchart --- arch/arm/mach-shmobile/board-kzm9g.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 335bdbbcd9f6..742704111f72 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -651,6 +651,9 @@ static const struct pinctrl_map kzm_pinctrl_map[] = { "sdhi2_data4", "sdhi2"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0", "sdhi2_ctrl", "sdhi2"), + /* SMSC */ + PIN_MAP_MUX_GROUP_DEFAULT("smsc911x.0", "pfc-sh73a0", + "bsc_cs4", "bsc"), }; /* @@ -718,9 +721,6 @@ static void __init kzm_init(void) sh73a0_pinmux_init(); - /* CS4 for SMSC/USB */ - gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */ - /* SMSC */ gpio_request_one(224, GPIOF_IN, NULL); /* IRQ3 */