]>
Commit | Line | Data |
---|---|---|
94b512b6 GKH |
1 | From ee9dd7631af6fb5c02964ed5b496217cd4ced059 Mon Sep 17 00:00:00 2001 |
2 | From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | |
3 | Date: Tue, 10 Apr 2012 17:32:44 +0200 | |
4 | Subject: ARM: at91: fix at91sam9261ek Ethernet dm9000 irq | |
5 | ||
6 | From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | |
7 | ||
8 | commit ee9dd7631af6fb5c02964ed5b496217cd4ced059 upstream. | |
9 | ||
10 | You need to setup the dm9000 irq via gpio_to_irq() since | |
11 | d0fbda9add (ARM: at91/gpio: drop PIN_BASE). | |
12 | ||
13 | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | |
14 | Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
16 | ||
17 | --- | |
18 | arch/arm/mach-at91/board-sam9261ek.c | 5 +++-- | |
19 | 1 file changed, 3 insertions(+), 2 deletions(-) | |
20 | ||
21 | --- a/arch/arm/mach-at91/board-sam9261ek.c | |
22 | +++ b/arch/arm/mach-at91/board-sam9261ek.c | |
23 | @@ -85,8 +85,6 @@ static struct resource dm9000_resource[] | |
24 | .flags = IORESOURCE_MEM | |
25 | }, | |
26 | [2] = { | |
27 | - .start = AT91_PIN_PC11, | |
28 | - .end = AT91_PIN_PC11, | |
29 | .flags = IORESOURCE_IRQ | |
30 | | IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE, | |
31 | } | |
32 | @@ -130,6 +128,8 @@ static struct sam9_smc_config __initdata | |
33 | ||
34 | static void __init ek_add_device_dm9000(void) | |
35 | { | |
36 | + struct resource *r = &dm9000_resource[2]; | |
37 | + | |
38 | /* Configure chip-select 2 (DM9000) */ | |
39 | sam9_smc_configure(0, 2, &dm9000_smc_config); | |
40 | ||
41 | @@ -139,6 +139,7 @@ static void __init ek_add_device_dm9000( | |
42 | /* Configure Interrupt pin as input, no pull-up */ | |
43 | at91_set_gpio_input(AT91_PIN_PC11, 0); | |
44 | ||
45 | + r->start = r->end = gpio_to_irq(AT91_PIN_PC11); | |
46 | platform_device_register(&dm9000_device); | |
47 | } | |
48 | #else |