1 files changed, 6 insertions, 8 deletions

diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index 8ac4e095e68e..e1f27d653f60 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -59,14 +59,12 @@ void __init prom_init(void)
         /* do low level board init */
         board_prom_init();
 
-        if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
-                /* set up SMP */
-                register_smp_ops(&bmips_smp_ops);
-
+        /* set up SMP */
+        if (!register_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 +72,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;
                 }