diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-07 07:46:02 -0500 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-15 08:34:12 -0400 |
commit | f423df8e4911dad0b3adf36b0865a902192711b8 (patch) | |
tree | 4e86ec22ac9b1a35211e6cadc5dcce6aa8a1907b /arch/arm | |
parent | a00f6e57aaeb9831e0d248022051e3b6662c484a (diff) |
ARM: shmobile: marzen: Register pinctrl mappings for LBSC
Replace the GPIO-based LBSC pinmux configuration by pinctrl mappings.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 04bcf8801c24..b16f85f43df4 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[] = { | |||
347 | "sdhi0_cd", "sdhi0"), | 347 | "sdhi0_cd", "sdhi0"), |
348 | PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779", | 348 | PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779", |
349 | "sdhi0_wp", "sdhi0"), | 349 | "sdhi0_wp", "sdhi0"), |
350 | /* SMSC */ | ||
351 | PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779", | ||
352 | "lbsc_ex_cs0", "lbsc"), | ||
350 | /* USB0 */ | 353 | /* USB0 */ |
351 | PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779", | 354 | PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779", |
352 | "usb0", "usb0"), | 355 | "usb0", "usb0"), |
@@ -370,7 +373,6 @@ static void __init marzen_init(void) | |||
370 | r8a7779_pinmux_init(); | 373 | r8a7779_pinmux_init(); |
371 | 374 | ||
372 | /* LAN89218 */ | 375 | /* LAN89218 */ |
373 | gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */ | ||
374 | gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */ | 376 | gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */ |
375 | 377 | ||
376 | r8a7779_add_standard_devices(); | 378 | r8a7779_add_standard_devices(); |