ARM: OMAP4: Fix errata i688 with MPU interconnect barriers.

[karo-tx-linux.git] / arch / arm / mach-omap2 / sleep44xx.S

diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
index 3154b63def351602e410684dd3fa3b4f970f0208..abd283400490396ea0c3e6f1da70dc1dda7425a3 100644 (file)
--- a/arch/arm/mach-omap2/sleep44xx.S
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -325,8 +325,16 @@ skip_l2en:
 ENDPROC(omap4_cpu_resume)
 #endif
 
+#ifndef CONFIG_OMAP4_ERRATA_I688
+ENTRY(omap_bus_sync)
+       mov     pc, lr
+ENDPROC(omap_bus_sync)
+#endif
+
 ENTRY(omap_do_wfi)
        stmfd   sp!, {lr}
+       /* Drain interconnect write buffers. */
+       bl omap_bus_sync
 
        /*
         * Execute an ISB instruction to ensure that all of the