Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 144f814a authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

[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: default avatarLennert Buytenhek <buytenh@marvell.com>
parent eeff6d86

arch/arm/mach-kirkwood/common.c

+6 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/mach-kirkwood/include/mach/irqs.h

+1 −0
Original line number Diff line number Diff line
@@ -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