MIPS: BCM63XX: disable SMP also on BCM3368
authorJonas Gorski <jogo@openwrt.org>
Wed, 18 Dec 2013 13:11:59 +0000 (14:11 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 22 Jan 2014 19:18:50 +0000 (20:18 +0100)
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/

arch/mips/bcm63xx/prom.c

index 8ac4e095e68e24b2ba3b43ba8ecc4d07e298557e..0215849c946e5c3baf7bf4b3fe3375c7c433e647 100644 (file)
@@ -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;
                }