From 64eaea4a84a14f0299b5c0bc400fa92c10512d07 Mon Sep 17 00:00:00 2001 From: Maxime Bizon Date: Fri, 13 Jul 2012 07:46:03 +0000 Subject: MIPS: BCM63XX: add external irq support for BCM6345 Add the missing definitions for BCM6345. Signed-off-by: Maxime Bizon Signed-off-by: Jonas Gorski Patchwork: http://patchwork.linux-mips.org/patch/4091/ Signed-off-by: John Crispin --- arch/mips/bcm63xx/setup.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/mips/bcm63xx/setup.c') diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index 0e74a13639c..bd83836fa15 100644 --- 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; -- cgit v1.2.3-70-g09d2 From 6d591805917cbc691e34cb3f8a10fef5997889bf Mon Sep 17 00:00:00 2001 From: Maxime Bizon Date: Fri, 13 Jul 2012 07:46:04 +0000 Subject: MIPS: BCM63XX: don't write to the chipid register on reboot While harmless, it is bad style to do so. Signed-off-by: Maxime Bizon Signed-off-by: Jonas Gorski Patchwork: http://patchwork.linux-mips.org/patch/4092/ Signed-off-by: John Crispin --- arch/mips/bcm63xx/setup.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/mips/bcm63xx/setup.c') diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index bd83836fa15..314231be788 100644 --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c @@ -86,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; -- cgit v1.2.3-70-g09d2