ARM: OMAP3: Add minimal omap3430 support

Add minimal omap3430 support based on earlier patches from
Syed Mohammed Khasim. Also merge in omap34xx SRAM support
from Karthik Dasu and use consistent naming for sram init
functions.

Also do following changes that make 34xx support usable:

- Remove unused sram.c functions for 34xx

- Rename IRQ_SIR_IRQ to INTCPS_SIR_IRQ and define it locally
  in entry-macro.S

- Update mach-omap2/io.c to support 2420, 2430, and 34xx

- Also merge in 34xx GPMC changes to add fields wr_access and
  wr_data_mux_bus from Adrian Hunter

- Remove memory initialization call omap2_init_memory() until
  until more generic memory initialization patches are posted.
  It's OK to rely on bootloader initialization until then.

Signed-off-by: Syed Mohammed, Khasim <khasim@ti.com>
Signed-off-by: Karthik Dasu<karthik-dp@ti.com>
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 105 insertions, 21 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 03c6ab1a3b1f..71a9de382d2d 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -43,7 +43,9 @@
  * The machine specific code may provide the extra mapping besides the
  * default mapping provided here.
  */
-static struct map_desc omap2_io_desc[] __initdata = {
+
+#ifdef CONFIG_ARCH_OMAP24XX
+static struct map_desc omap24xx_io_desc[] __initdata = {
         {
                 .virtual        = L3_24XX_VIRT,
                 .pfn            = __phys_to_pfn(L3_24XX_PHYS),
@@ -51,12 +53,39 @@ static struct map_desc omap2_io_desc[] __initdata = {
                 .type           = MT_DEVICE
         },
         {
-                .virtual        = L4_24XX_VIRT,
-                .pfn            = __phys_to_pfn(L4_24XX_PHYS),
-                .length         = L4_24XX_SIZE,
-                .type           = MT_DEVICE
+                .virtual        = L4_24XX_VIRT,
+                .pfn            = __phys_to_pfn(L4_24XX_PHYS),
+                .length         = L4_24XX_SIZE,
+                .type           = MT_DEVICE
+        },
+};
+
+#ifdef CONFIG_ARCH_OMAP2420
+static struct map_desc omap242x_io_desc[] __initdata = {
+        {
+                .virtual        = DSP_MEM_24XX_VIRT,
+                .pfn            = __phys_to_pfn(DSP_MEM_24XX_PHYS),
+                .length         = DSP_MEM_24XX_SIZE,
+                .type           = MT_DEVICE
+        },
+        {
+                .virtual        = DSP_IPI_24XX_VIRT,
+                .pfn            = __phys_to_pfn(DSP_IPI_24XX_PHYS),
+                .length         = DSP_IPI_24XX_SIZE,
+                .type           = MT_DEVICE
         },
+        {
+                .virtual        = DSP_MMU_24XX_VIRT,
+                .pfn            = __phys_to_pfn(DSP_MMU_24XX_PHYS),
+                .length         = DSP_MMU_24XX_SIZE,
+                .type           = MT_DEVICE
+        },
+};
+
+#endif
+
 #ifdef CONFIG_ARCH_OMAP2430
+static struct map_desc omap243x_io_desc[] __initdata = {
         {
                 .virtual        = L4_WK_243X_VIRT,
                 .pfn            = __phys_to_pfn(L4_WK_243X_PHYS),
@@ -69,30 +98,90 @@ 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
+#endif
+
+#ifdef  CONFIG_ARCH_OMAP34XX
+static struct map_desc omap34xx_io_desc[] __initdata = {
         {
-                .virtual        = DSP_MEM_24XX_VIRT,
-                .pfn            = __phys_to_pfn(DSP_MEM_24XX_PHYS),
-                .length         = DSP_MEM_24XX_SIZE,
+                .virtual        = L3_34XX_VIRT,
+                .pfn            = __phys_to_pfn(L3_34XX_PHYS),
+                .length         = L3_34XX_SIZE,
                 .type           = MT_DEVICE
         },
         {
-                .virtual        = DSP_IPI_24XX_VIRT,
-                .pfn            = __phys_to_pfn(DSP_IPI_24XX_PHYS),
-                .length         = DSP_IPI_24XX_SIZE,
+                .virtual        = L4_34XX_VIRT,
+                .pfn            = __phys_to_pfn(L4_34XX_PHYS),
+                .length         = L4_34XX_SIZE,
                 .type           = MT_DEVICE
         },
         {
-                .virtual        = DSP_MMU_24XX_VIRT,
-                .pfn            = __phys_to_pfn(DSP_MMU_24XX_PHYS),
-                .length         = DSP_MMU_24XX_SIZE,
+                .virtual        = L4_WK_34XX_VIRT,
+                .pfn            = __phys_to_pfn(L4_WK_34XX_PHYS),
+                .length         = L4_WK_34XX_SIZE,
+                .type           = MT_DEVICE
+        },
+        {
+                .virtual        = OMAP34XX_GPMC_VIRT,
+                .pfn            = __phys_to_pfn(OMAP34XX_GPMC_PHYS),
+                .length         = OMAP34XX_GPMC_SIZE,
+                .type           = MT_DEVICE
+        },
+        {
+                .virtual        = OMAP343X_SMS_VIRT,
+                .pfn            = __phys_to_pfn(OMAP343X_SMS_PHYS),
+                .length         = OMAP343X_SMS_SIZE,
+                .type           = MT_DEVICE
+        },
+        {
+                .virtual        = OMAP343X_SDRC_VIRT,
+                .pfn            = __phys_to_pfn(OMAP343X_SDRC_PHYS),
+                .length         = OMAP343X_SDRC_SIZE,
                 .type           = MT_DEVICE
-        }
+        },
+        {
+                .virtual        = L4_PER_34XX_VIRT,
+                .pfn            = __phys_to_pfn(L4_PER_34XX_PHYS),
+                .length         = L4_PER_34XX_SIZE,
+                .type           = MT_DEVICE
+        },
+        {
+                .virtual        = L4_EMU_34XX_VIRT,
+                .pfn            = __phys_to_pfn(L4_EMU_34XX_PHYS),
+                .length         = L4_EMU_34XX_SIZE,
+                .type           = MT_DEVICE
+        },
 };
+#endif
 
 void __init omap2_map_common_io(void)
 {
-        iotable_init(omap2_io_desc, ARRAY_SIZE(omap2_io_desc));
+#if defined(CONFIG_ARCH_OMAP2420)
+        iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
+        iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));
+#endif
+
+#if defined(CONFIG_ARCH_OMAP2430)
+        iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
+        iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));
+#endif
+
+#if defined(CONFIG_ARCH_OMAP34XX)
+        iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
+#endif
 
         /* Normally devicemaps_init() would flush caches and tlb after
          * mdesc->map_io(), but we must also do it here because of the CPU
@@ -112,11 +201,6 @@ void __init omap2_init_common_hw(void)
         pwrdm_init(powerdomains_omap);
         clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);
         omap2_clk_init();
-/*
- * Need to Fix this for 2430
- */
-#ifndef CONFIG_ARCH_OMAP2430
         omap2_init_memory();
-#endif
         gpmc_init();
 }