[ARM] Kirkwood: wire up ethernet error interrupt

Wire up the ethernet port's error interrupt so that the
mv643xx_eth driver can sleep for SMI event completion instead of
having to busy-wait for it.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>

diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 189f16f..435fb35 100644 (file)
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -108,6 +108,11 @@ static struct resource kirkwood_ge00_shared_resources[] = {
                .start  = GE00_PHYS_BASE + 0x2000,
                .end    = GE00_PHYS_BASE + 0x3fff,
                .flags  = IORESOURCE_MEM,
+       }, {
+               .name   = "ge00 err irq",
+               .start  = IRQ_KIRKWOOD_GE00_ERR,
+               .end    = IRQ_KIRKWOOD_GE00_ERR,
+               .flags  = IORESOURCE_IRQ,
        },
 };
 
@@ -117,7 +122,7 @@ static struct platform_device kirkwood_ge00_shared = {
        .dev            = {
                .platform_data  = &kirkwood_ge00_shared_data,
        },
-       .num_resources  = 1,
+       .num_resources  = ARRAY_SIZE(kirkwood_ge00_shared_resources),
        .resource       = kirkwood_ge00_shared_resources,
 };
 

diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
index 6fd0583..ffab89f 100644 (file)
--- a/arch/arm/mach-kirkwood/include/mach/irqs.h
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h
@@ -50,6 +50,7 @@
 #define IRQ_KIRKWOOD_GPIO_HIGH_0_7     39
 #define IRQ_KIRKWOOD_GPIO_HIGH_8_15    40
 #define IRQ_KIRKWOOD_GPIO_HIGH_16_23   41
+#define IRQ_KIRKWOOD_GE00_ERR  46
 
 /*
  * KIRKWOOD General Purpose Pins