Add missing external IRQ code parts for older chips in the new code. SVN-Revision: 31128master
parent
44d546290a
commit
0876972850
@ -0,0 +1,96 @@ |
||||
--- a/arch/mips/bcm63xx/irq.c
|
||||
+++ b/arch/mips/bcm63xx/irq.c
|
||||
@@ -45,8 +45,8 @@ static void __internal_irq_unmask_64(uns
|
||||
#define is_ext_irq_cascaded 0
|
||||
#define ext_irq_start 0
|
||||
#define ext_irq_end 0
|
||||
-#define ext_irq_count 0
|
||||
-#define ext_irq_cfg_reg1 0
|
||||
+#define ext_irq_count 4
|
||||
+#define ext_irq_cfg_reg1 PERF_EXTIRQ_CFG_REG_6345
|
||||
#define ext_irq_cfg_reg2 0
|
||||
#endif
|
||||
#ifdef CONFIG_BCM63XX_CPU_6348
|
||||
@@ -122,11 +122,15 @@ static void bcm63xx_init_irq(void)
|
||||
irq_stat_addr += PERF_IRQSTAT_6338_REG;
|
||||
irq_mask_addr += PERF_IRQMASK_6338_REG;
|
||||
irq_bits = 32;
|
||||
+ ext_irq_count = 4;
|
||||
+ ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
|
||||
break;
|
||||
case BCM6345_CPU_ID:
|
||||
irq_stat_addr += PERF_IRQSTAT_6345_REG;
|
||||
irq_mask_addr += PERF_IRQMASK_6345_REG;
|
||||
irq_bits = 32;
|
||||
+ ext_irq_count = 4;
|
||||
+ ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
|
||||
break;
|
||||
case BCM6348_CPU_ID:
|
||||
irq_stat_addr += PERF_IRQSTAT_6348_REG;
|
||||
@@ -413,7 +417,8 @@ static int bcm63xx_external_irq_set_type
|
||||
reg = bcm_perf_readl(regaddr);
|
||||
irq %= 4;
|
||||
|
||||
- if (BCMCPU_IS_6348()) {
|
||||
+ switch (bcm63xx_get_cpu_id()) {
|
||||
+ case BCM6348_CPU_ID:
|
||||
if (levelsense)
|
||||
reg |= EXTIRQ_CFG_LEVELSENSE_6348(irq);
|
||||
else
|
||||
@@ -426,9 +431,12 @@ static int bcm63xx_external_irq_set_type
|
||||
reg |= EXTIRQ_CFG_BOTHEDGE_6348(irq);
|
||||
else
|
||||
reg &= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);
|
||||
- }
|
||||
+ break;
|
||||
|
||||
- if (BCMCPU_IS_6338() || BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
|
||||
+ case BCM6338_CPU_ID:
|
||||
+ case BCM6345_CPU_ID:
|
||||
+ case BCM6358_CPU_ID:
|
||||
+ case BCM6368_CPU_ID:
|
||||
if (levelsense)
|
||||
reg |= EXTIRQ_CFG_LEVELSENSE(irq);
|
||||
else
|
||||
@@ -441,6 +449,9 @@ static int bcm63xx_external_irq_set_type
|
||||
reg |= EXTIRQ_CFG_BOTHEDGE(irq);
|
||||
else
|
||||
reg &= ~EXTIRQ_CFG_BOTHEDGE(irq);
|
||||
+ break;
|
||||
+ default:
|
||||
+ BUG();
|
||||
}
|
||||
|
||||
bcm_perf_writel(reg, regaddr);
|
||||
--- a/arch/mips/bcm63xx/setup.c
|
||||
+++ b/arch/mips/bcm63xx/setup.c
|
||||
@@ -71,6 +71,9 @@ void bcm63xx_machine_reboot(void)
|
||||
case BCM6338_CPU_ID:
|
||||
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338;
|
||||
break;
|
||||
+ case BCM6345_CPU_ID:
|
||||
+ perf_regs[0] = PERF_EXTIRQ_CFG_REG_6345;
|
||||
+ break;
|
||||
case BCM6348_CPU_ID:
|
||||
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348;
|
||||
break;
|
||||
@@ -80,6 +83,9 @@ void bcm63xx_machine_reboot(void)
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
+ if (!perf_regs[i])
|
||||
+ break;
|
||||
+
|
||||
reg = bcm_perf_readl(perf_regs[i]);
|
||||
if (BCMCPU_IS_6348()) {
|
||||
reg &= ~EXTIRQ_CFG_MASK_ALL_6348;
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||||
@@ -134,6 +134,7 @@
|
||||
|
||||
/* External Interrupt Configuration register */
|
||||
#define PERF_EXTIRQ_CFG_REG_6338 0x14
|
||||
+#define PERF_EXTIRQ_CFG_REG_6345 0x14
|
||||
#define PERF_EXTIRQ_CFG_REG_6348 0x14
|
||||
#define PERF_EXTIRQ_CFG_REG_6358 0x14
|
||||
#define PERF_EXTIRQ_CFG_REG_6368 0x18
|
Loading…
Reference in new issue