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, 28 insertions, 4 deletions

diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c
index 0253c456ed5b..af326efc1ad3 100644
--- a/arch/arm/plat-omap/io.c
+++ b/arch/arm/plat-omap/io.c
@@ -47,11 +47,13 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
         }
 #endif
 #ifdef CONFIG_ARCH_OMAP2
-        if (cpu_class_is_omap2()) {
+        if (cpu_is_omap24xx()) {
                 if (BETWEEN(p, L3_24XX_PHYS, L3_24XX_SIZE))
                         return XLATE(p, L3_24XX_PHYS, L3_24XX_VIRT);
                 if (BETWEEN(p, L4_24XX_PHYS, L4_24XX_SIZE))
                         return XLATE(p, L4_24XX_PHYS, L4_24XX_VIRT);
+        }
+        if (cpu_is_omap2420()) {
                 if (BETWEEN(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_SIZE))
                         return XLATE(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_VIRT);
                 if (BETWEEN(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE))
@@ -59,14 +61,36 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
                 if (BETWEEN(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_SIZE))
                         return XLATE(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_VIRT);
         }
-#ifdef CONFIG_ARCH_OMAP2430
         if (cpu_is_omap2430()) {
                 if (BETWEEN(p, L4_WK_243X_PHYS, L4_WK_243X_SIZE))
-                        return XLATE(L4_WK_243X_PHYS, L4_WK_243X_VIRT);
+                        return XLATE(p, L4_WK_243X_PHYS, L4_WK_243X_VIRT);
                 if (BETWEEN(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_SIZE))
-                        return XLATE(OMAP243X_GPMC_PHYS, OMAP243X_GPMC_VIRT);
+                        return XLATE(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_VIRT);
+                if (BETWEEN(p, OMAP243X_SDRC_PHYS, OMAP243X_SDRC_SIZE))
+                        return XLATE(p, OMAP243X_SDRC_PHYS, OMAP243X_SDRC_VIRT);
+                if (BETWEEN(p, OMAP243X_SMS_PHYS, OMAP243X_SMS_SIZE))
+                        return XLATE(p, OMAP243X_SMS_PHYS, OMAP243X_SMS_VIRT);
         }
 #endif
+#ifdef CONFIG_ARCH_OMAP3
+        if (cpu_is_omap34xx()) {
+                if (BETWEEN(p, L3_34XX_PHYS, L3_34XX_SIZE))
+                        return XLATE(p, L3_34XX_PHYS, L3_34XX_VIRT);
+                if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE))
+                        return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT);
+                if (BETWEEN(p, L4_WK_34XX_PHYS, L4_WK_34XX_SIZE))
+                        return XLATE(p, L4_WK_34XX_PHYS, L4_WK_34XX_VIRT);
+                if (BETWEEN(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_SIZE))
+                        return XLATE(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_VIRT);
+                if (BETWEEN(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_SIZE))
+                        return XLATE(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_VIRT);
+                if (BETWEEN(p, OMAP343X_SDRC_PHYS, OMAP343X_SDRC_SIZE))
+                        return XLATE(p, OMAP343X_SDRC_PHYS, OMAP343X_SDRC_VIRT);
+                if (BETWEEN(p, L4_PER_34XX_PHYS, L4_PER_34XX_SIZE))
+                        return XLATE(p, L4_PER_34XX_PHYS, L4_PER_34XX_VIRT);
+                if (BETWEEN(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_SIZE))
+                        return XLATE(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_VIRT);
+        }
 #endif
 
         return __arm_ioremap(p, size, type);