summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm63xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-06-18 08:34:32 +0000
committerRalf Baechle <ralf@linux-mips.org>2013-07-01 15:10:59 +0200
commit7ac836ce2aa7b931f6347e554cb65f9e9cc1da57 (patch)
tree13b99f09142adc6265dc5cf69b9574b411926471 /arch/mips/bcm63xx
parenta068dde168e0c618e1dc2151a0922254ec3bbf04 (diff)
downloadlinux-stable-7ac836ce2aa7b931f6347e554cb65f9e9cc1da57.tar.gz
linux-stable-7ac836ce2aa7b931f6347e554cb65f9e9cc1da57.tar.bz2
linux-stable-7ac836ce2aa7b931f6347e554cb65f9e9cc1da57.zip
MIPS: BCM63xx: Enable second core SMP on BCM6328 if available
BCM6328 has a OTP which tells us if the second core is available. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Cc: linux-mips@linux-mips.org Cc: John Crispin <blogic@openwrt.org> Cc: Maxime Bizon <mbizon@freebox.fr> Cc: Florian Fainelli <florian@openwrt.org> Cc: Kevin Cernekee <cernekee@gmail.com> Patchwork: https://patchwork.linux-mips.org/patch/5490/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r--arch/mips/bcm63xx/prom.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index 3b21454c56a0..8ac4e095e68e 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -69,7 +69,11 @@ void __init prom_init(void)
* for now.
*/
if (BCMCPU_IS_6328()) {
- bmips_smp_enabled = 0;
+ reg = bcm_readl(BCM_6328_OTP_BASE +
+ OTP_USER_BITS_6328_REG(3));
+
+ if (reg & OTP_6328_REG3_TP1_DISABLED)
+ bmips_smp_enabled = 0;
} else if (BCMCPU_IS_6358()) {
bmips_smp_enabled = 0;
}