diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-14 10:36:06 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-05-15 17:49:03 +0200 |
| commit | 93ef85b5598ad2cc23f38d97ed565027b969c0aa (patch) | |
| tree | d8d0744cd0f50d5b753396196bc0329fac211966 /arch/mips | |
| parent | 6015a856f16ccf33e9f83643d04c2e15be2384eb (diff) | |
| download | linux-stable-93ef85b5598ad2cc23f38d97ed565027b969c0aa.tar.gz linux-stable-93ef85b5598ad2cc23f38d97ed565027b969c0aa.tar.bz2 linux-stable-93ef85b5598ad2cc23f38d97ed565027b969c0aa.zip | |
MIPS: ath79: fix a wrong IRQ number
The Ubiquiti XM board setup code uses an invalid
IRQ number, because it if above of NR_IRQS. This
leads to failed 'request_irq' calls:
ath9k 0000:00:00.0: request_irq failed
ath9k: probe of 0000:00:00.0 failed with error -22
Preserve some IRQ numbers for the built-in IRQ
controller of PCI host controllers in the
AR71XX/AR724X SoCs, and use the correct IRQ
number in the board setup code.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3495/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/ath79/mach-ubnt-xm.c | 5 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-ath79/irq.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c index 3266ee063bd6..0d95b67a7d4f 100644 --- a/arch/mips/ath79/mach-ubnt-xm.c +++ b/arch/mips/ath79/mach-ubnt-xm.c @@ -17,6 +17,8 @@ #include <linux/ath9k_platform.h> #endif /* CONFIG_PCI */ +#include <asm/mach-ath79/irq.h> + #include "machtypes.h" #include "dev-gpio-buttons.h" #include "dev-leds-gpio.h" @@ -33,7 +35,6 @@ #define UBNT_XM_KEYS_POLL_INTERVAL 20 #define UBNT_XM_KEYS_DEBOUNCE_INTERVAL (3 * UBNT_XM_KEYS_POLL_INTERVAL) -#define UBNT_XM_PCI_IRQ 48 #define UBNT_XM_EEPROM_ADDR (u8 *) KSEG1ADDR(0x1fff1000) static struct gpio_led ubnt_xm_leds_gpio[] __initdata = { @@ -86,7 +87,7 @@ static struct ath9k_platform_data ubnt_xm_eeprom_data; static struct ar724x_pci_data ubnt_xm_pci_data[] = { { - .irq = UBNT_XM_PCI_IRQ, + .irq = ATH79_PCI_IRQ(0), .pdata = &ubnt_xm_eeprom_data, }, }; diff --git a/arch/mips/include/asm/mach-ath79/irq.h b/arch/mips/include/asm/mach-ath79/irq.h index 519958fe4e3c..6ae2646da4f4 100644 --- a/arch/mips/include/asm/mach-ath79/irq.h +++ b/arch/mips/include/asm/mach-ath79/irq.h @@ -10,11 +10,15 @@ #define __ASM_MACH_ATH79_IRQ_H #define MIPS_CPU_IRQ_BASE 0 -#define NR_IRQS 40 +#define NR_IRQS 46 #define ATH79_MISC_IRQ_BASE 8 #define ATH79_MISC_IRQ_COUNT 32 +#define ATH79_PCI_IRQ_BASE (ATH79_MISC_IRQ_BASE + ATH79_MISC_IRQ_COUNT) +#define ATH79_PCI_IRQ_COUNT 6 +#define ATH79_PCI_IRQ(_x) (ATH79_PCI_IRQ_BASE + (_x)) + #define ATH79_CPU_IRQ_IP2 (MIPS_CPU_IRQ_BASE + 2) #define ATH79_CPU_IRQ_USB (MIPS_CPU_IRQ_BASE + 3) #define ATH79_CPU_IRQ_GE0 (MIPS_CPU_IRQ_BASE + 4) |