Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=520588f47f20a6dcaf81655e1da378e5fe6d5015
Commit:     520588f47f20a6dcaf81655e1da378e5fe6d5015
Parent:     b241cb0c885e55839fb0f93c6a4539c5416cc39f
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 6 17:58:56 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Fri Jun 8 02:43:49 2007 +0000

    sh: URAM node support for SH7722.
    
    This adds the URAM block on SH7722 as a separate node.
    Sparsemem is required for this, or it can simply be disabled
    by explicitly selecting a flatmem model.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/kernel/cpu/sh4a/setup-sh7722.c |    9 ++++++++-
 arch/sh/mm/Kconfig                     |    2 ++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c 
b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 1143fbf..82dba7f 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -1,7 +1,7 @@
 /*
  * SH7722 Setup
  *
- *  Copyright (C) 2006  Paul Mundt
+ *  Copyright (C) 2006 - 2007  Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -10,6 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/serial.h>
+#include <linux/mm.h>
 #include <asm/sci.h>
 
 static struct plat_sci_port sci_platform_data[] = {
@@ -78,3 +79,9 @@ void __init init_IRQ_ipr(void)
 {
        make_ipr_irq(sh7722_ipr_map, ARRAY_SIZE(sh7722_ipr_map));
 }
+
+void __init plat_mem_setup(void)
+{
+       /* Register the URAM space as Node 1 */
+       setup_bootmem_node(1, 0x055f0000, 0x05610000);
+}
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 8c5b73a..dd9b226 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -211,6 +211,7 @@ config CPU_SUBTYPE_SH7722
        select CPU_SH4AL_DSP
        select CPU_SHX2
        select CPU_HAS_IPR_IRQ
+       select ARCH_SPARSEMEM_ENABLE
 
 endchoice
 
@@ -321,6 +322,7 @@ config ARCH_SPARSEMEM_DEFAULT
 
 config MAX_ACTIVE_REGIONS
        int
+       default "2" if (CPU_SUBTYPE_SH7722 && SPARSEMEM)
        default "1"
 
 config ARCH_POPULATES_NODE_MAP
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to