ARM: davinci: fix cache flush build error
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 2 Aug 2011 15:48:38 +0000 (17:48 +0200)
committerSekhar Nori <nsekhar@ti.com>
Wed, 7 Sep 2011 11:52:12 +0000 (17:22 +0530)
The TNET variant of DaVinci compiles some code that it shares
with other DaVinci variants, however it has a V6 CPU rather than
an ARM926T, thus the hardcoded call to arm926_flush_kern_cache_all()
in sleep.S will obviously fail, and we need to build with the
v6_flush_kern_cache_all() call instead. This was triggered by
manually altering the DaVinci config to build the TNET version.

Cc: Dave Martin <dave.martin@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Cc: stable@kernel.org
arch/arm/mach-davinci/sleep.S

index fb5e72b532b00bba9ecfe0976c440d9ea825b6c8..5f1e045a3ad1a6e6ffc05d23fb95ff835e97f1b6 100644 (file)
@@ -217,7 +217,11 @@ ddr2clk_stop_done:
 ENDPROC(davinci_ddr_psc_config)
 
 CACHE_FLUSH:
-       .word   arm926_flush_kern_cache_all
+#ifdef CONFIG_CPU_V6
+       .word   v6_flush_kern_cache_all
+#else
+       .word   arm926_flush_kern_cache_all
+#endif
 
 ENTRY(davinci_cpu_suspend_sz)
        .word   . - davinci_cpu_suspend