aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-18 19:18:46 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-18 19:18:46 +0000
commit1b8137eefc96dbd538f447921d7228fc6012d3b3 (patch)
tree9a2b3747323b379c4083b1eb9c5a71733354e87f
parent58911deda585cb9cc5a3a4c7ea18185f2216c723 (diff)
downloadupstream-1b8137eefc96dbd538f447921d7228fc6012d3b3.tar.gz
upstream-1b8137eefc96dbd538f447921d7228fc6012d3b3.tar.bz2
upstream-1b8137eefc96dbd538f447921d7228fc6012d3b3.zip
ar71xx: merge AR71XX_IRQ_CPU_{PCI,WMAC} into AR71XX_IRQ_CPU_IP2
SVN-Revision: 20279
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/dev-ar913x-wmac.c4
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/irq.c6
-rw-r--r--target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h3
3 files changed, 6 insertions, 7 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ar913x-wmac.c b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ar913x-wmac.c
index 67eaa833b8..024d29044b 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ar913x-wmac.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ar913x-wmac.c
@@ -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,
},
};
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
index 3a91e00aad..25d643d035 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c
@@ -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)
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
index 1a1ec4ba1a..8ac5598ce3 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
@@ -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)