]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
MIPS: Netlogic: Core wakeup changes for XLP2XX
authorJayachandran C <jchandra@broadcom.com>
Sun, 11 Aug 2013 09:13:57 +0000 (14:43 +0530)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 3 Sep 2013 21:22:19 +0000 (23:22 +0200)
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>
arch/mips/netlogic/xlp/wakeup.c

index 0cce37cbffef06816c99a0f4efcf8ae40a98d163..682d5638dc01cafcbf72ec5700e802a80116fe8f 100644 (file)
@@ -58,10 +58,12 @@ static int xlp_wakeup_core(uint64_t sysbase, int node, int core)
 
        coremask = (1 << core);
 
-       /* Enable CPU clock */
-       value = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL);
-       value &= ~coremask;
-       nlm_write_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL, value);
+       /* Enable CPU clock in case of 8xx/3xx */
+       if (!cpu_is_xlpii()) {
+               value = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL);
+               value &= ~coremask;
+               nlm_write_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL, value);
+       }
 
        /* Remove CPU Reset */
        value = nlm_read_sys_reg(sysbase, SYS_CPU_RESET);