diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-07 13:46:02 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-15 13:34:13 +0100 |
| commit | ee097e661722c65486cb94c07ae7393e8c11fb4b (patch) | |
| tree | 59714ac40ac7fb4f5013f3b9fabdd982a90ffd7b | |
| parent | f423df8e4911dad0b3adf36b0865a902192711b8 (diff) | |
| download | linux-stable-ee097e661722c65486cb94c07ae7393e8c11fb4b.tar.gz linux-stable-ee097e661722c65486cb94c07ae7393e8c11fb4b.tar.bz2 linux-stable-ee097e661722c65486cb94c07ae7393e8c11fb4b.zip | |
ARM: shmobile: marzen: Register pinctrl mappings for INTC
Replace the GPIO-based INTC pinmux configuration by pinctrl mappings.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index b16f85f43df4..5852331743e7 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -25,7 +25,6 @@ #include <linux/platform_device.h> #include <linux/delay.h> #include <linux/io.h> -#include <linux/gpio.h> #include <linux/dma-mapping.h> #include <linux/pinctrl/machine.h> #include <linux/regulator/fixed.h> @@ -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)); } |