brcm63xx: fix a few issues in irq chip drivers

[openwrt.git] / target / linux / brcm63xx / patches-3.18 / 341-MIPS-BCM63XX-add-support-for-BCM6318.patch

diff --git a/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
index 440a30e..0e4df97 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
+++ b/target/linux/brcm63xx/patches-3.18/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
@@ -199,9 +199,9 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
                ext_shift = 4;
                break;
 +      case BCM6318_CPU_ID:
-+              l2_intc_bases[0] += PERF_IRQMASK_6318_REG;
-+              l2_irq_count = 1;
-+              l2_width = 4;
++              periph_bases[0] += PERF_IRQMASK_6318_REG;
++              periph_irq_count = 1;
++              periph_width = 4;
 +
 +              ext_intc_bases[0] += PERF_EXTIRQ_CFG_REG_6318;
 +              ext_irq_count = 4;
@@ -212,8 +212,8 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
 +              ext_shift = 4;
 +              break;
        case BCM6328_CPU_ID:
-               l2_intc_bases[0] += PERF_IRQMASK_6328_REG(0);
-               l2_intc_bases[1] += PERF_IRQMASK_6328_REG(1);
+               periph_bases[0] += PERF_IRQMASK_6328_REG(0);
+               periph_bases[1] += PERF_IRQMASK_6328_REG(1);
 --- a/arch/mips/bcm63xx/prom.c
 +++ b/arch/mips/bcm63xx/prom.c
 @@ -72,7 +72,7 @@ void __init prom_init(void)