From d3428e91017f2ecf5655b3ffdf6ed65f5430ade1 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 8 Aug 2007 17:06:54 +0900 Subject: [PATCH] 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 --- arch/sh/kernel/cpu/sh4a/setup-shx3.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c index f7a2cc221d2..98f153554de 100644 --- 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 */ } -- 2.41.0