1 files changed, 1 insertions, 38 deletions

diff --git a/arch/arm/mach-omap2/sram.c b/arch/arm/mach-omap2/sram.c
index ddf1818af228..cd488b80ba36 100644
--- a/arch/arm/mach-omap2/sram.c
+++ b/arch/arm/mach-omap2/sram.c
@@ -32,12 +32,6 @@
 
 #define OMAP2_SRAM_PUB_PA       (OMAP2_SRAM_PA + 0xf800)
 #define OMAP3_SRAM_PUB_PA       (OMAP3_SRAM_PA + 0x8000)
-#ifdef CONFIG_OMAP4_ERRATA_I688
-#define OMAP4_SRAM_PUB_PA       OMAP4_SRAM_PA
-#else
-#define OMAP4_SRAM_PUB_PA       (OMAP4_SRAM_PA + 0x4000)
-#endif
-#define OMAP5_SRAM_PA           0x40300000
 
 #define SRAM_BOOTLOADER_SZ      0x00
 
@@ -105,32 +99,14 @@ static void __init omap_detect_sram(void)
                         } else {
                                 omap_sram_size = 0x8000; /* 32K */
                         }
-                } else if (cpu_is_omap44xx()) {
-                        omap_sram_start = OMAP4_SRAM_PUB_PA;
-                        omap_sram_size = 0xa000; /* 40K */
-                } else if (soc_is_omap54xx()) {
-                        omap_sram_start = OMAP5_SRAM_PA;
-                        omap_sram_size = SZ_128K; /* 128KB */
                 } else {
                         omap_sram_start = OMAP2_SRAM_PUB_PA;
                         omap_sram_size = 0x800; /* 2K */
                 }
         } else {
-                if (soc_is_am33xx()) {
-                        omap_sram_start = AM33XX_SRAM_PA;
-                        omap_sram_size = 0x10000; /* 64K */
-                } else if (soc_is_am43xx()) {
-                        omap_sram_start = AM33XX_SRAM_PA;
-                        omap_sram_size = SZ_256K;
-                } else if (cpu_is_omap34xx()) {
+                if (cpu_is_omap34xx()) {
                         omap_sram_start = OMAP3_SRAM_PA;
                         omap_sram_size = 0x10000; /* 64K */
-                } else if (cpu_is_omap44xx()) {
-                        omap_sram_start = OMAP4_SRAM_PA;
-                        omap_sram_size = 0xe000; /* 56K */
-                } else if (soc_is_omap54xx()) {
-                        omap_sram_start = OMAP5_SRAM_PA;
-                        omap_sram_size = SZ_128K; /* 128KB */
                 } else {
                         omap_sram_start = OMAP2_SRAM_PA;
                         if (cpu_is_omap242x())
@@ -148,12 +124,6 @@ static void __init omap2_map_sram(void)
 {
         int cached = 1;
 
-#ifdef CONFIG_OMAP4_ERRATA_I688
-        if (cpu_is_omap44xx()) {
-                omap_sram_start += PAGE_SIZE;
-                omap_sram_size -= SZ_16K;
-        }
-#endif
         if (cpu_is_omap34xx()) {
                 /*
                  * SRAM must be marked as non-cached on OMAP3 since the
@@ -285,11 +255,6 @@ static inline int omap34xx_sram_init(void)
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 
-static inline int am33xx_sram_init(void)
-{
-        return 0;
-}
-
 int __init omap_sram_init(void)
 {
         omap_detect_sram();
@@ -299,8 +264,6 @@ int __init omap_sram_init(void)
                 omap242x_sram_init();
         else if (cpu_is_omap2430())
                 omap243x_sram_init();
-        else if (soc_is_am33xx())
-                am33xx_sram_init();
         else if (cpu_is_omap34xx())
                 omap34xx_sram_init();