From f423df8e4911dad0b3adf36b0865a902192711b8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 7 Mar 2013 13:46:02 +0100 Subject: [PATCH] ARM: shmobile: marzen: Register pinctrl mappings for LBSC Replace the GPIO-based LBSC pinmux configuration by pinctrl mappings. Signed-off-by: Laurent Pinchart --- arch/arm/mach-shmobile/board-marzen.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 04bcf88..b16f85f4 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -347,6 +347,9 @@ static const struct pinctrl_map marzen_pinctrl_map[] = { "sdhi0_cd", "sdhi0"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779", "sdhi0_wp", "sdhi0"), + /* SMSC */ + PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779", + "lbsc_ex_cs0", "lbsc"), /* USB0 */ PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779", "usb0", "usb0"), @@ -370,7 +373,6 @@ static void __init marzen_init(void) r8a7779_pinmux_init(); /* LAN89218 */ - gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */ gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */ r8a7779_add_standard_devices(); -- 2.7.4