aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/ath79
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-14 05:36:06 -0400
committerRalf Baechle <ralf@linux-mips.org>2012-05-15 11:49:03 -0400
commit93ef85b5598ad2cc23f38d97ed565027b969c0aa (patch)
treed8d0744cd0f50d5b753396196bc0329fac211966 /arch/mips/ath79
parent6015a856f16ccf33e9f83643d04c2e15be2384eb (diff)
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/ath79')
-rw-r--r--arch/mips/ath79/mach-ubnt-xm.c5
1 files changed, 3 insertions, 2 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 @@
17#include <linux/ath9k_platform.h> 17#include <linux/ath9k_platform.h>
18#endif /* CONFIG_PCI */ 18#endif /* CONFIG_PCI */
19 19
20#include <asm/mach-ath79/irq.h>
21
20#include "machtypes.h" 22#include "machtypes.h"
21#include "dev-gpio-buttons.h" 23#include "dev-gpio-buttons.h"
22#include "dev-leds-gpio.h" 24#include "dev-leds-gpio.h"
@@ -33,7 +35,6 @@
33#define UBNT_XM_KEYS_POLL_INTERVAL 20 35#define UBNT_XM_KEYS_POLL_INTERVAL 20
34#define UBNT_XM_KEYS_DEBOUNCE_INTERVAL (3 * UBNT_XM_KEYS_POLL_INTERVAL) 36#define UBNT_XM_KEYS_DEBOUNCE_INTERVAL (3 * UBNT_XM_KEYS_POLL_INTERVAL)
35 37
36#define UBNT_XM_PCI_IRQ 48
37#define UBNT_XM_EEPROM_ADDR (u8 *) KSEG1ADDR(0x1fff1000) 38#define UBNT_XM_EEPROM_ADDR (u8 *) KSEG1ADDR(0x1fff1000)
38 39
39static struct gpio_led ubnt_xm_leds_gpio[] __initdata = { 40static struct gpio_led ubnt_xm_leds_gpio[] __initdata = {
@@ -86,7 +87,7 @@ static struct ath9k_platform_data ubnt_xm_eeprom_data;
86 87
87static struct ar724x_pci_data ubnt_xm_pci_data[] = { 88static struct ar724x_pci_data ubnt_xm_pci_data[] = {
88 { 89 {
89 .irq = UBNT_XM_PCI_IRQ, 90 .irq = ATH79_PCI_IRQ(0),
90 .pdata = &ubnt_xm_eeprom_data, 91 .pdata = &ubnt_xm_eeprom_data,
91 }, 92 },
92}; 93};