From: Laurent Pinchart Date: Thu, 7 Mar 2013 12:46:02 +0000 (+0100) Subject: ARM: shmobile: marzen: Register pinctrl mappings for INTC X-Git-Tag: v3.10-rc1~64^2~4^2~69 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee097e661722c65486cb94c07ae7393e8c11fb4b;p=platform%2Fkernel%2Flinux-3.10.git ARM: shmobile: marzen: Register pinctrl mappings for INTC Replace the GPIO-based INTC pinmux configuration by pinctrl mappings. Signed-off-by: Laurent Pinchart --- diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index b16f85f4..5852331 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -349,6 +348,8 @@ static const struct pinctrl_map marzen_pinctrl_map[] = { "sdhi0_wp", "sdhi0"), /* SMSC */ PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779", + "intc_irq1_b", "intc"), + PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779", "lbsc_ex_cs0", "lbsc"), /* USB0 */ PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779", @@ -372,9 +373,6 @@ static void __init marzen_init(void) ARRAY_SIZE(marzen_pinctrl_map)); r8a7779_pinmux_init(); - /* LAN89218 */ - gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */ - r8a7779_add_standard_devices(); platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); }