]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] Orion: wire up ethernet error interrupt
authorLennert Buytenhek <buytenh@wantstofly.org>
Tue, 26 Aug 2008 14:01:21 +0000 (16:01 +0200)
committerNicolas Pitre <nico@cam.org>
Thu, 25 Sep 2008 20:26:43 +0000 (16:26 -0400)
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>
arch/arm/mach-orion5x/common.c

index 7b11e552bc5a89f3eb6ec4d85338157102afefb3..83367265bcf60af85b2ce63b1bc8defb252b6340 100644 (file)
@@ -154,6 +154,10 @@ static struct resource orion5x_eth_shared_resources[] = {
                .start  = ORION5X_ETH_PHYS_BASE + 0x2000,
                .end    = ORION5X_ETH_PHYS_BASE + 0x3fff,
                .flags  = IORESOURCE_MEM,
+       }, {
+               .start  = IRQ_ORION5X_ETH_ERR,
+               .end    = IRQ_ORION5X_ETH_ERR,
+               .flags  = IORESOURCE_IRQ,
        },
 };
 
@@ -163,7 +167,7 @@ static struct platform_device orion5x_eth_shared = {
        .dev            = {
                .platform_data  = &orion5x_eth_shared_data,
        },
-       .num_resources  = 1,
+       .num_resources  = ARRAY_SIZE(orion5x_eth_shared_resources),
        .resource       = orion5x_eth_shared_resources,
 };