3 files changed, 21 insertions, 12 deletions

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 6e94c7e2c16..a71c25b6258 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -170,7 +170,9 @@
 #define PRID_IMP_NETLOGIC_XLS408B       0x4e00
 #define PRID_IMP_NETLOGIC_XLS404B       0x4f00
 
-#define PRID_IMP_NETLOGIC_XLP832        0x1000
+#define PRID_IMP_NETLOGIC_XLP8XX        0x1000
+#define PRID_IMP_NETLOGIC_XLP3XX        0x1100
+
 /*
  * Definitions for 7:0 on legacy processors
  */
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 92fae7f459c..40c9c51c80e 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1025,7 +1025,8 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)
                         MIPS_CPU_LLSC);
 
         switch (c->processor_id & 0xff00) {
-        case PRID_IMP_NETLOGIC_XLP832:
+        case PRID_IMP_NETLOGIC_XLP8XX:
+        case PRID_IMP_NETLOGIC_XLP3XX:
                 c->cputype = CPU_XLP;
                 __cpu_name[cpu] = "Netlogic XLP";
                 break;
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index 885f6878594..9428e7125fe 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -86,20 +86,26 @@ int nlm_irt_to_irq(int irt)
         }
 }
 
-unsigned int nlm_get_cpu_frequency(void)
+unsigned int nlm_get_core_frequency(int core)
 {
-        unsigned int pll_divf, pll_divr, dfs_div, denom;
-        unsigned int val;
+        unsigned int pll_divf, pll_divr, dfs_div, ext_div;
+        unsigned int rstval, dfsval, denom;
         uint64_t num;
 
-        val = nlm_read_sys_reg(nlm_sys_base, SYS_POWER_ON_RESET_CFG);
-        pll_divf = (val >> 10) & 0x7f;
-        pll_divr = (val >> 8)  & 0x3;
-        dfs_div  = (val >> 17) & 0x3;
+        rstval = nlm_read_sys_reg(nlm_sys_base, SYS_POWER_ON_RESET_CFG);
+        dfsval = nlm_read_sys_reg(nlm_sys_base, SYS_CORE_DFS_DIV_VALUE);
+        pll_divf = ((rstval >> 10) & 0x7f) + 1;
+        pll_divr = ((rstval >> 8)  & 0x3) + 1;
+        ext_div  = ((rstval >> 30) & 0x3) + 1;
+        dfs_div  = ((dfsval >> (core * 4)) & 0xf) + 1;
 
-        num = pll_divf + 1;
-        denom = 3 * (pll_divr + 1) * (1 << (dfs_div + 1));
-        num = num * 800000000ULL;
+        num = 800000000ULL * pll_divf;
+        denom = 3 * pll_divr * ext_div * dfs_div;
         do_div(num, denom);
         return (unsigned int)num;
 }
+
+unsigned int nlm_get_cpu_frequency(void)
+{
+        return nlm_get_core_frequency(0);
+}