Merge commit '5bc66170dc486556a1e36fd384463536573f4b82' into x86/urgent

[deliverable/linux.git] / arch / mips / bcm63xx / setup.c

diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
index 0e74a13639cd235b47fcbb8070ecab9b01782e2b..314231be788cd7365c55e3501187600296932c38 100644 (file)
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -74,6 +74,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;
@@ -83,6 +86,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;