]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: OMAP5: Make errata i688 workaround available
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Fri, 15 Feb 2013 12:35:49 +0000 (18:05 +0530)
committerSantosh Shilimkar <santosh.shilimkar@ti.com>
Tue, 19 Mar 2013 07:27:03 +0000 (12:57 +0530)
Errata i688 is also applicable for OMAP5 based devices. Update the
code so that it can be enabled on OMAP5 devices.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/io.c

index 8111cd9ff3e5201d9c92a66a90a24e30823d7074..b9c0ed3f648c8415f432a5f4b8f079c163beb013 100644 (file)
@@ -408,7 +408,7 @@ config OMAP3_SDRC_AC_TIMING
 
 config OMAP4_ERRATA_I688
        bool "OMAP4 errata: Async Bridge Corruption"
-       depends on ARCH_OMAP4 && !ARCH_MULTIPLATFORM
+       depends on (ARCH_OMAP4 || SOC_OMAP5) && !ARCH_MULTIPLATFORM
        select ARCH_HAS_BARRIERS
        help
          If a data is stalled inside asynchronous bridge because of back
index 2c3fdd65387b56c542d6d97cbc093fcf69a51b9a..2bef5a7e6af806a05495d4e7d40de312bd6e160a 100644 (file)
@@ -271,6 +271,14 @@ static struct map_desc omap54xx_io_desc[] __initdata = {
                .length         = L4_PER_54XX_SIZE,
                .type           = MT_DEVICE,
        },
+#ifdef CONFIG_OMAP4_ERRATA_I688
+       {
+               .virtual        = OMAP4_SRAM_VA,
+               .pfn            = __phys_to_pfn(OMAP4_SRAM_PA),
+               .length         = PAGE_SIZE,
+               .type           = MT_MEMORY_SO,
+       },
+#endif
 };
 #endif
 
@@ -323,6 +331,7 @@ void __init omap4_map_io(void)
 void __init omap5_map_io(void)
 {
        iotable_init(omap54xx_io_desc, ARRAY_SIZE(omap54xx_io_desc));
+       omap_barriers_init();
 }
 #endif
 /*