From: Kevin Hilman 
Add mappings for SDRC ans SMS so that omap2_memory_init() works on the

2430.  This also allows the mpurate= command-line option to work.
Signed-off-by: Kevin Hilman

Signed-off-by: Tony Lindgren

---

 arch/arm/mach-omap2/io.c             |   17 ++++++++++++-----

 include/asm-arm/arch-omap/io.h       |    7 +++++++

 include/asm-arm/arch-omap/omap24xx.h |    3 ++-

 3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c

index c3dafcb..871fde3 100644

--- a/arch/arm/mach-omap2/io.c

+++ b/arch/arm/mach-omap2/io.c

@@ -61,6 +61,18 @@ static struct map_desc omap2_io_desc[] __initdata = {

 		.length		= OMAP243X_GPMC_SIZE,

 		.type		= MT_DEVICE

 	},

+	{

+		.virtual	= OMAP243X_SDRC_VIRT,

+		.pfn		= __phys_to_pfn(OMAP243X_SDRC_PHYS),

+		.length		= OMAP243X_SDRC_SIZE,

+		.type		= MT_DEVICE

+	},

+	{

+		.virtual	= OMAP243X_SMS_VIRT,

+		.pfn		= __phys_to_pfn(OMAP243X_SMS_PHYS),

+		.length		= OMAP243X_SMS_SIZE,

+		.type		= MT_DEVICE

+	},

 #endif

 	{

 		.virtual	= DSP_MEM_24XX_VIRT,

@@ -102,11 +114,6 @@ void __init omap2_init_common_hw(void)

 {

 	omap2_mux_init();

 	omap2_clk_init();

-/*

- * Need to Fix this for 2430

- */

-#ifndef CONFIG_ARCH_OMAP2430

 	omap2_init_memory();

-#endif

 	gpmc_init();

 }

diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h

index 289082d..d2fe0d0 100644

--- a/include/asm-arm/arch-omap/io.h

+++ b/include/asm-arm/arch-omap/io.h

@@ -80,6 +80,13 @@

 #define OMAP243X_GPMC_PHYS	OMAP243X_GPMC_BASE	/* 0x49000000 */

 #define OMAP243X_GPMC_VIRT	0xFE000000

 #define OMAP243X_GPMC_SIZE	SZ_1M

+#define OMAP243X_SDRC_PHYS	OMAP24XX_SDRC_BASE

+#define OMAP243X_SDRC_VIRT	0xFD000000

+#define OMAP243X_SDRC_SIZE	SZ_1M

+#define OMAP243X_SMS_PHYS	OMAP243X_SMS_BASE

+#define OMAP243X_SMS_VIRT	0xFC000000

+#define OMAP243X_SMS_SIZE	SZ_1M

+

 #endif
 #define IO_OFFSET	0x90000000

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h

index 14c0f94..764329c 100644

--- a/include/asm-arm/arch-omap/omap24xx.h

+++ b/include/asm-arm/arch-omap/omap24xx.h

@@ -27,8 +27,9 @@

 #ifdef CONFIG_ARCH_OMAP2430

 #define OMAP24XX_32KSYNCT_BASE	(L4_WK_243X_BASE + 0x20000)

 #define OMAP24XX_PRCM_BASE	(L4_WK_243X_BASE + 0x6000)

-#define OMAP24XX_SDRC_BASE	(0x6D000000)

 #define OMAP242X_CONTROL_STATUS	(L4_24XX_BASE + 0x2f8)

+#define OMAP243X_SMS_BASE	0x6C000000

+#define OMAP24XX_SDRC_BASE	0x6D000000

 #define OMAP243X_GPMC_BASE	0x6E000000

 #endif
--

1.4.4.2
-

unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please read the FAQ at  http://www.tux.org/lkml/