KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: merge AR71XX_IRQ_CPU_{PCI,WMAC} into AR71XX_IRQ_CPU_IP2

Browse source 
SVN-Revision: 20279
This commit is contained in:
Gabor Juhos 2010-03-18 19:18:46 +00:00
parent 58911deda5
commit 1b8137eefc
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,
.flags = IORESOURCE_MEM,
}, {
.start = AR71XX_CPU_IRQ_WMAC,
.end = AR71XX_CPU_IRQ_WMAC,
.start = AR71XX_CPU_IRQ_IP2,
.end = AR71XX_CPU_IRQ_IP2,
.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);
}
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)
@ -179,7 +179,7 @@ static void __init ar724x_pci_irq_init(void)
handle_level_irq);
}
setup_irq(AR71XX_CPU_IRQ_PCI, &ar724x_pci_irqaction);
setup_irq(AR71XX_CPU_IRQ_IP2, &ar724x_pci_irqaction);
}
#else
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)
{
do_IRQ(AR71XX_CPU_IRQ_WMAC);
do_IRQ(AR71XX_CPU_IRQ_IP2);
}
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_COUNT 8
#define AR71XX_CPU_IRQ_PCI (AR71XX_CPU_IRQ_BASE + 2)
#define AR71XX_CPU_IRQ_WMAC (AR71XX_CPU_IRQ_BASE + 2)
#define AR71XX_CPU_IRQ_IP2 (AR71XX_CPU_IRQ_BASE + 2)
#define AR71XX_CPU_IRQ_USB (AR71XX_CPU_IRQ_BASE + 3)
#define AR71XX_CPU_IRQ_GE0 (AR71XX_CPU_IRQ_BASE + 4)
#define AR71XX_CPU_IRQ_GE1 (AR71XX_CPU_IRQ_BASE + 5)