diff options
| -rw-r--r-- | arch/mips/bcm63xx/irq.c | 8 | ||||
| -rw-r--r-- | arch/mips/bcm63xx/setup.c | 3 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c index 18e051ad18a5..d40169f83259 100644 --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c | |||
| @@ -56,8 +56,8 @@ static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused; | |||
| 56 | #define is_ext_irq_cascaded 0 | 56 | #define is_ext_irq_cascaded 0 |
| 57 | #define ext_irq_start 0 | 57 | #define ext_irq_start 0 |
| 58 | #define ext_irq_end 0 | 58 | #define ext_irq_end 0 |
| 59 | #define ext_irq_count 0 | 59 | #define ext_irq_count 4 |
| 60 | #define ext_irq_cfg_reg1 0 | 60 | #define ext_irq_cfg_reg1 PERF_EXTIRQ_CFG_REG_6345 |
| 61 | #define ext_irq_cfg_reg2 0 | 61 | #define ext_irq_cfg_reg2 0 |
| 62 | #endif | 62 | #endif |
| 63 | #ifdef CONFIG_BCM63XX_CPU_6348 | 63 | #ifdef CONFIG_BCM63XX_CPU_6348 |
| @@ -143,11 +143,15 @@ static void bcm63xx_init_irq(void) | |||
| 143 | irq_stat_addr += PERF_IRQSTAT_6338_REG; | 143 | irq_stat_addr += PERF_IRQSTAT_6338_REG; |
| 144 | irq_mask_addr += PERF_IRQMASK_6338_REG; | 144 | irq_mask_addr += PERF_IRQMASK_6338_REG; |
| 145 | irq_bits = 32; | 145 | irq_bits = 32; |
| 146 | ext_irq_count = 4; | ||
| 147 | ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338; | ||
| 146 | break; | 148 | break; |
| 147 | case BCM6345_CPU_ID: | 149 | case BCM6345_CPU_ID: |
| 148 | irq_stat_addr += PERF_IRQSTAT_6345_REG; | 150 | irq_stat_addr += PERF_IRQSTAT_6345_REG; |
| 149 | irq_mask_addr += PERF_IRQMASK_6345_REG; | 151 | irq_mask_addr += PERF_IRQMASK_6345_REG; |
| 150 | irq_bits = 32; | 152 | irq_bits = 32; |
| 153 | ext_irq_count = 4; | ||
| 154 | ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345; | ||
| 151 | break; | 155 | break; |
| 152 | case BCM6348_CPU_ID: | 156 | case BCM6348_CPU_ID: |
| 153 | irq_stat_addr += PERF_IRQSTAT_6348_REG; | 157 | irq_stat_addr += PERF_IRQSTAT_6348_REG; |
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index 0e74a13639cd..bd83836fa15e 100644 --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c | |||
| @@ -74,6 +74,9 @@ void bcm63xx_machine_reboot(void) | |||
| 74 | case BCM6338_CPU_ID: | 74 | case BCM6338_CPU_ID: |
| 75 | perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338; | 75 | perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338; |
| 76 | break; | 76 | break; |
| 77 | case BCM6345_CPU_ID: | ||
| 78 | perf_regs[0] = PERF_EXTIRQ_CFG_REG_6345; | ||
| 79 | break; | ||
| 77 | case BCM6348_CPU_ID: | 80 | case BCM6348_CPU_ID: |
| 78 | perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348; | 81 | perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348; |
| 79 | break; | 82 | break; |
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h index 4ccc2a748aff..75f162db580d 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | |||
| @@ -161,6 +161,7 @@ | |||
| 161 | /* External Interrupt Configuration register */ | 161 | /* External Interrupt Configuration register */ |
| 162 | #define PERF_EXTIRQ_CFG_REG_6328 0x18 | 162 | #define PERF_EXTIRQ_CFG_REG_6328 0x18 |
| 163 | #define PERF_EXTIRQ_CFG_REG_6338 0x14 | 163 | #define PERF_EXTIRQ_CFG_REG_6338 0x14 |
| 164 | #define PERF_EXTIRQ_CFG_REG_6345 0x14 | ||
| 164 | #define PERF_EXTIRQ_CFG_REG_6348 0x14 | 165 | #define PERF_EXTIRQ_CFG_REG_6348 0x14 |
| 165 | #define PERF_EXTIRQ_CFG_REG_6358 0x14 | 166 | #define PERF_EXTIRQ_CFG_REG_6358 0x14 |
| 166 | #define PERF_EXTIRQ_CFG_REG_6368 0x18 | 167 | #define PERF_EXTIRQ_CFG_REG_6368 0x18 |
