diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-12-18 08:11:59 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-01-22 14:18:50 -0500 |
commit | 0e983d7b90e1272cde588529453fec1ceb822e4c (patch) | |
tree | 4c7831451f4f1eec3bf8c3a6a99a520acde1f7c8 | |
parent | 83bb90fa1bb52adc4983ddc8c34ac56f0b0fcc3c (diff) |
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.c | 8 |
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) | |||
64 | register_smp_ops(&bmips_smp_ops); | 64 | register_smp_ops(&bmips_smp_ops); |
65 | 65 | ||
66 | /* | 66 | /* |
67 | * BCM6328 might not have its second CPU enabled, while BCM6358 | 67 | * BCM6328 might not have its second CPU enabled, while BCM3368 |
68 | * needs special handling for its shared TLB, so disable SMP | 68 | * and BCM6358 need special handling for their shared TLB, so |
69 | * for now. | 69 | * disable SMP for now. |
70 | */ | 70 | */ |
71 | if (BCMCPU_IS_6328()) { | 71 | if (BCMCPU_IS_6328()) { |
72 | reg = bcm_readl(BCM_6328_OTP_BASE + | 72 | reg = bcm_readl(BCM_6328_OTP_BASE + |
@@ -74,7 +74,7 @@ void __init prom_init(void) | |||
74 | 74 | ||
75 | if (reg & OTP_6328_REG3_TP1_DISABLED) | 75 | if (reg & OTP_6328_REG3_TP1_DISABLED) |
76 | bmips_smp_enabled = 0; | 76 | bmips_smp_enabled = 0; |
77 | } else if (BCMCPU_IS_6358()) { | 77 | } else if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) { |
78 | bmips_smp_enabled = 0; | 78 | bmips_smp_enabled = 0; |
79 | } | 79 | } |
80 | 80 | ||