diff options
author | Jayachandran C <jchandra@broadcom.com> | 2013-08-11 05:13:57 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-09-03 17:22:19 -0400 |
commit | c49e42aba8e8471e30e0ee4d29f9871a4ba67ae9 (patch) | |
tree | 1fb595a42304185d1b2183093a4d757adb11e478 /arch/mips/netlogic | |
parent | 57ceb4b02045bd677b70f9e2b3d41e8c1bb86598 (diff) |
MIPS: Netlogic: Core wakeup changes for XLP2XX
On XLP2xx, wakeup code does not need to enable clock on the core.
Update xlp/wakeup.c to handle this.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5703/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/netlogic')
-rw-r--r-- | arch/mips/netlogic/xlp/wakeup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c index 0cce37cbffef..682d5638dc01 100644 --- a/arch/mips/netlogic/xlp/wakeup.c +++ b/arch/mips/netlogic/xlp/wakeup.c | |||
@@ -58,10 +58,12 @@ static int xlp_wakeup_core(uint64_t sysbase, int node, int core) | |||
58 | 58 | ||
59 | coremask = (1 << core); | 59 | coremask = (1 << core); |
60 | 60 | ||
61 | /* Enable CPU clock */ | 61 | /* Enable CPU clock in case of 8xx/3xx */ |
62 | value = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL); | 62 | if (!cpu_is_xlpii()) { |
63 | value &= ~coremask; | 63 | value = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL); |
64 | nlm_write_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL, value); | 64 | value &= ~coremask; |
65 | nlm_write_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL, value); | ||
66 | } | ||
65 | 67 | ||
66 | /* Remove CPU Reset */ | 68 | /* Remove CPU Reset */ |
67 | value = nlm_read_sys_reg(sysbase, SYS_CPU_RESET); | 69 | value = nlm_read_sys_reg(sysbase, SYS_CPU_RESET); |