qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 05:48:05 +02:00
Code

ar71xx: merge AR71XX_IRQ_CPU_{PCI,WMAC} into AR71XX_IRQ_CPU_IP2

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20279 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2010-03-18 19:18:46 +00:00
parent 4a8b61e3be
commit c7a42847a5
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ar71xx/files/arch/mips/ar71xx/dev-ar913x-wmac.c
View File

@ -31,8 +31,8 @@ static struct resource ar913x_wmac_resources[] = {
.end = AR91XX_WMAC_BASE + AR91XX_WMAC_SIZE - 1, .end = AR91XX_WMAC_BASE + AR91XX_WMAC_SIZE - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, { }, {
.start = AR71XX_CPU_IRQ_WMAC, .start = AR71XX_CPU_IRQ_IP2,
.end = AR71XX_CPU_IRQ_WMAC, .end = AR71XX_CPU_IRQ_IP2,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
}; };

6
target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
View File

@ -95,7 +95,7 @@ static void __init ar71xx_pci_irq_init(void)
handle_level_irq); handle_level_irq);
} }
setup_irq(AR71XX_CPU_IRQ_PCI, &ar71xx_pci_irqaction); setup_irq(AR71XX_CPU_IRQ_IP2, &ar71xx_pci_irqaction);
} }
static void ar724x_pci_irq_dispatch(void) static void ar724x_pci_irq_dispatch(void)
@ -179,7 +179,7 @@ static void __init ar724x_pci_irq_init(void)
handle_level_irq); handle_level_irq);
} }
setup_irq(AR71XX_CPU_IRQ_PCI, &ar724x_pci_irqaction); setup_irq(AR71XX_CPU_IRQ_IP2, &ar724x_pci_irqaction);
} }
#else #else
static inline void ar71xx_pci_irq_init(void) {}; static inline void ar71xx_pci_irq_init(void) {};
@ -368,7 +368,7 @@ static void __init ar71xx_misc_irq_init(void)
static void ar913x_wmac_irq_dispatch(void) static void ar913x_wmac_irq_dispatch(void)
{ {
do_IRQ(AR71XX_CPU_IRQ_WMAC); do_IRQ(AR71XX_CPU_IRQ_IP2);
} }
asmlinkage void plat_irq_dispatch(void) asmlinkage void plat_irq_dispatch(void)

3
target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
View File

@ -79,8 +79,7 @@
#define AR71XX_PCI_IRQ_BASE 48 #define AR71XX_PCI_IRQ_BASE 48
#define AR71XX_PCI_IRQ_COUNT 8 #define AR71XX_PCI_IRQ_COUNT 8
#define AR71XX_CPU_IRQ_PCI (AR71XX_CPU_IRQ_BASE + 2) #define AR71XX_CPU_IRQ_IP2 (AR71XX_CPU_IRQ_BASE + 2)
#define AR71XX_CPU_IRQ_WMAC (AR71XX_CPU_IRQ_BASE + 2)
#define AR71XX_CPU_IRQ_USB (AR71XX_CPU_IRQ_BASE + 3) #define AR71XX_CPU_IRQ_USB (AR71XX_CPU_IRQ_BASE + 3)
#define AR71XX_CPU_IRQ_GE0 (AR71XX_CPU_IRQ_BASE + 4) #define AR71XX_CPU_IRQ_GE0 (AR71XX_CPU_IRQ_BASE + 4)
#define AR71XX_CPU_IRQ_GE1 (AR71XX_CPU_IRQ_BASE + 5) #define AR71XX_CPU_IRQ_GE1 (AR71XX_CPU_IRQ_BASE + 5)