MIPS: Netlogic: Add cpu to node mapping for XLP9XX

XLP9XX has 20 cores per node, opposed to 8 on earlier XLP8XX.
Update code that calculates node id from cpu id to handle this.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6283/

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c
index 3800bf6551ab..8092bb320618 100644
--- a/arch/mips/netlogic/common/irq.c
+++ b/arch/mips/netlogic/common/irq.c
@@ -223,7 +223,7 @@ static void nlm_init_node_irqs(int node)
                         continue;
 
                 nlm_pic_init_irt(nodep->picbase, irt, i,
-                                        node * NLM_CPUS_PER_NODE, 0);
+                                node * nlm_threads_per_node(), 0);
                 nlm_setup_pic_irq(node, i, i, irt);
         }
 }
@@ -232,8 +232,8 @@ void nlm_smp_irq_init(int hwcpuid)
 {
         int node, cpu;
 
-        node = hwcpuid / NLM_CPUS_PER_NODE;
-        cpu  = hwcpuid % NLM_CPUS_PER_NODE;
+        node = nlm_cpuid_to_node(hwcpuid);
+        cpu  = hwcpuid % nlm_threads_per_node();
 
         if (cpu == 0 && node != 0)
                 nlm_init_node_irqs(node);