From: Simon Horman Date: Thu, 18 Apr 2013 12:21:09 +0000 (+0900) Subject: ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC X-Git-Tag: next-20130527~8^2^16~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2ff4ab1d960aa493e0d04fc973f0077216b97d67;p=karo-tx-linux.git ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC Update the marzen board to use the INTC External IRQ pin driver for SMSC. This code was originally posted by Magnus Damm as part of "ARM: shmobile: INTC External IRQ pin driver on r8a7779" but somehow omitted when I applied that patch. Cc: Magnus Damm Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index fac9e0f87897..71f174e12932 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -69,7 +69,7 @@ static struct resource smsc911x_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = gic_iid(0x3c), /* IRQ 1 */ + .start = irq_pin(1), /* IRQ 1 */ .flags = IORESOURCE_IRQ, }, }; @@ -405,6 +405,7 @@ static void __init marzen_init(void) pinctrl_register_mappings(marzen_pinctrl_map, ARRAY_SIZE(marzen_pinctrl_map)); r8a7779_pinmux_init(); + r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */ r8a7779_add_standard_devices(); platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));