summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-12-18 14:11:59 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-01-22 20:18:50 +0100
commit0e983d7b90e1272cde588529453fec1ceb822e4c (patch)
tree4c7831451f4f1eec3bf8c3a6a99a520acde1f7c8
parent83bb90fa1bb52adc4983ddc8c34ac56f0b0fcc3c (diff)
downloadlinux-stable-0e983d7b90e1272cde588529453fec1ceb822e4c.tar.gz
linux-stable-0e983d7b90e1272cde588529453fec1ceb822e4c.tar.bz2
linux-stable-0e983d7b90e1272cde588529453fec1ceb822e4c.zip
MIPS: BCM63XX: disable SMP also on BCM3368
BCM3368 has the same shared TLB as BCM6358. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6239/
-rw-r--r--arch/mips/bcm63xx/prom.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index 8ac4e095e68e..0215849c946e 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -64,9 +64,9 @@ void __init prom_init(void)
register_smp_ops(&bmips_smp_ops);
/*
- * BCM6328 might not have its second CPU enabled, while BCM6358
- * needs special handling for its shared TLB, so disable SMP
- * for now.
+ * BCM6328 might not have its second CPU enabled, while BCM3368
+ * and BCM6358 need special handling for their shared TLB, so
+ * disable SMP for now.
*/
if (BCMCPU_IS_6328()) {
reg = bcm_readl(BCM_6328_OTP_BASE +
@@ -74,7 +74,7 @@ void __init prom_init(void)
if (reg & OTP_6328_REG3_TP1_DISABLED)
bmips_smp_enabled = 0;
- } else if (BCMCPU_IS_6358()) {
+ } else if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
bmips_smp_enabled = 0;
}