summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-10 17:32:44 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-04-16 11:08:26 +0200
commitee9dd7631af6fb5c02964ed5b496217cd4ced059 (patch)
treed3b0d2d244e0e29138d76cce3e54e859e39afc77 /arch
parentbf66b0d1dad30cc1241dc4e3ac193251a4694f5c (diff)
downloadop-kernel-dev-ee9dd7631af6fb5c02964ed5b496217cd4ced059.zip
op-kernel-dev-ee9dd7631af6fb5c02964ed5b496217cd4ced059.tar.gz
ARM: at91: fix at91sam9261ek Ethernet dm9000 irq
You need to setup the dm9000 irq via gpio_to_irq() since d0fbda9add (ARM: at91/gpio: drop PIN_BASE). Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: stable <stable@vger.kernel.org> [3.2+]
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/board-sam9261ek.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index c3f9944..065fed3 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -85,8 +85,6 @@ static struct resource dm9000_resource[] = {
.flags = IORESOURCE_MEM
},
[2] = {
- .start = AT91_PIN_PC11,
- .end = AT91_PIN_PC11,
.flags = IORESOURCE_IRQ
| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,
}
@@ -130,6 +128,8 @@ static struct sam9_smc_config __initdata dm9000_smc_config = {
static void __init ek_add_device_dm9000(void)
{
+ struct resource *r = &dm9000_resource[2];
+
/* Configure chip-select 2 (DM9000) */
sam9_smc_configure(0, 2, &dm9000_smc_config);
@@ -139,6 +139,7 @@ static void __init ek_add_device_dm9000(void)
/* Configure Interrupt pin as input, no pull-up */
at91_set_gpio_input(AT91_PIN_PC11, 0);
+ r->start = r->end = gpio_to_irq(AT91_PIN_PC11);
platform_device_register(&dm9000_device);
}
#else
OpenPOWER on IntegriCloud