diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
tree | 2636079800fa045501982a70e1be0425c1b968c2 /arch/mips/bcm63xx/prom.c | |
parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'arch/mips/bcm63xx/prom.c')
-rw-r--r-- | arch/mips/bcm63xx/prom.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c index be252efa0757..99d7f405cbeb 100644 --- a/arch/mips/bcm63xx/prom.c +++ b/arch/mips/bcm63xx/prom.c @@ -32,9 +32,12 @@ void __init prom_init(void) mask = CKCTL_6345_ALL_SAFE_EN; else if (BCMCPU_IS_6348()) mask = CKCTL_6348_ALL_SAFE_EN; - else - /* BCMCPU_IS_6358() */ + else if (BCMCPU_IS_6358()) mask = CKCTL_6358_ALL_SAFE_EN; + else if (BCMCPU_IS_6368()) + mask = CKCTL_6368_ALL_SAFE_EN; + else + mask = 0; reg = bcm_perf_readl(PERF_CKCTL_REG); reg &= ~mask; |