sh: Wire up CSM node for SH-X3.

Now that NODES_SHIFT is bumped up, we can plug in the CSM block as
a separate node, too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index f7a2cc221d22b864ef21611b67c93b3976f8442f..98f153554debb5dd5d58dc265eac3c7612b20ad4 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -258,14 +258,17 @@ void __init plat_irq_setup(void)
 
 void __init plat_mem_setup(void)
 {
+       unsigned int nid = 1;
+
        /* Register CPU#0 URAM space as Node 1 */
-       setup_bootmem_node(1, 0x145f0000, 0x14610000);  /* CPU0 */
+       setup_bootmem_node(nid++, 0x145f0000, 0x14610000);      /* CPU0 */
 
 #if 0
        /* XXX: Not yet.. */
-       setup_bootmem_node(2, 0x14df0000, 0x14e10000);  /* CPU1 */
-       setup_bootmem_node(3, 0x155f0000, 0x15610000);  /* CPU2 */
-       setup_bootmem_node(4, 0x15df0000, 0x15e10000);  /* CPU3 */
-       setup_bootmem_node(5, 0x16000000, 0x16020000);  /* CSM */
+       setup_bootmem_node(nid++, 0x14df0000, 0x14e10000);      /* CPU1 */
+       setup_bootmem_node(nid++, 0x155f0000, 0x15610000);      /* CPU2 */
+       setup_bootmem_node(nid++, 0x15df0000, 0x15e10000);      /* CPU3 */
 #endif
+
+       setup_bootmem_node(nid++, 0x16000000, 0x16020000);      /* CSM */
 }