From: Kevin Hilman <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
---
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(-)
Index: linux-2.6/arch/arm/mach-omap2/io.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/io.c 2007-04-09 15:34:44.000000000
-0400
+++ linux-2.6/arch/arm/mach-omap2/io.c 2007-04-09 15:34:49.000000000 -0400
@@ -55,6 +55,18 @@ static struct map_desc omap2_io_desc[] _
.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,
@@ -96,11 +108,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();
}
Index: linux-2.6/include/asm-arm/arch-omap/io.h
===================================================================
--- linux-2.6.orig/include/asm-arm/arch-omap/io.h 2007-04-09
15:34:44.000000000 -0400
+++ linux-2.6/include/asm-arm/arch-omap/io.h 2007-04-09 15:34:49.000000000
-0400
@@ -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
Index: linux-2.6/include/asm-arm/arch-omap/omap24xx.h
===================================================================
--- linux-2.6.orig/include/asm-arm/arch-omap/omap24xx.h 2007-04-09
15:34:44.000000000 -0400
+++ linux-2.6/include/asm-arm/arch-omap/omap24xx.h 2007-04-09
15:34:49.000000000 -0400
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
