MIPS: Netlogic: Add support for XLP5XX

Add support for the XLP5XX processor which is an 8 core variant of the
XLP9XX. Add XLP5XX cases to code which earlier handled XLP9XX.

Signed-off-by: Yonghong Song <ysong@broadcom.com>
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6871/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 11 insertions, 1 deletions

diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c
index 0b36ac80a232..bba993a5b1b0 100644
--- a/arch/mips/netlogic/xlp/dt.c
+++ b/arch/mips/netlogic/xlp/dt.c
@@ -51,6 +51,7 @@ void __init *xlp_dt_init(void *fdtp)
                 switch (current_cpu_data.processor_id & PRID_IMP_MASK) {
 #ifdef CONFIG_DT_XLP_GVP
                 case PRID_IMP_NETLOGIC_XLP9XX:
+                case PRID_IMP_NETLOGIC_XLP5XX:
                         fdtp = __dtb_xlp_gvp_begin;
                         break;
 #endif
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 1ddb62bd354b..4fdd9fd29d1d 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -123,6 +123,7 @@ const char *get_system_type(void)
 {
         switch (read_c0_prid() & PRID_IMP_MASK) {
         case PRID_IMP_NETLOGIC_XLP9XX:
+        case PRID_IMP_NETLOGIC_XLP5XX:
         case PRID_IMP_NETLOGIC_XLP2XX:
                 return "Broadcom XLPII Series";
         default:
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c
index f4823ad6145f..e5f44d2605a8 100644
--- a/arch/mips/netlogic/xlp/wakeup.c
+++ b/arch/mips/netlogic/xlp/wakeup.c
@@ -135,7 +135,15 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
                 if (cpu_is_xlp9xx()) {
                         fusebase = nlm_get_fuse_regbase(n);
                         fusemask = nlm_read_reg(fusebase, FUSE_9XX_DEVCFG6);
-                        mask = 0xfffff;
+                        switch (read_c0_prid() & PRID_IMP_MASK) {
+                        case PRID_IMP_NETLOGIC_XLP5XX:
+                                mask = 0xff;
+                                break;
+                        case PRID_IMP_NETLOGIC_XLP9XX:
+                        default:
+                                mask = 0xfffff;
+                                break;
+                        }
                 } else {
                         fusemask = nlm_read_sys_reg(nodep->sysbase,
                                                 SYS_EFUSE_DEVICE_CFG_STATUS0);