m68k: Rename icache_invalid to invalidate_icache_all

The implementation of icache_invalid appears to be doing what other
architectures call invalidate_icache_all so rename to match.

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
index 6ef7f7be1af8f938a708359dc9c732378a314337..aa8d2edb40ba94cb043eb28dc7acc78b505a4c46 100644 (file)
--- a/arch/m68k/include/asm/cache.h
+++ b/arch/m68k/include/asm/cache.h
@@ -185,7 +185,6 @@
 
 #ifndef __ASSEMBLY__           /* put C only stuff in this section */
 
-void icache_invalid(void);
 void dcache_invalid(void);
 
 #endif

diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
index dab834c1cbd84076f75e92616a30438933df663b..370ad40f1423d08300b5c1bd7d44d67c4c662162 100644 (file)
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@@ -29,7 +29,7 @@ int dcache_status(void)
 
 void icache_enable(void)
 {
-       icache_invalid();
+       invalidate_icache_all();
 
        *cf_icache_status = 1;
 
@@ -53,7 +53,7 @@ void icache_disable(void)
        u32 temp = 0;
 
        *cf_icache_status = 0;
-       icache_invalid();
+       invalidate_icache_all();
 
 #if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E)
        __asm__ __volatile__("movec %0, %%acr2"::"r"(temp));
@@ -68,7 +68,7 @@ void icache_disable(void)
 #endif
 }
 
-void icache_invalid(void)
+void invalidate_icache_all(void)
 {
        u32 temp;
 

diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 04b711e4f650498624019f9293bbea6bdb35d703..7e53492733ed1c99ceccb324c015fc35118f1fc9 100644 (file)
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -11,6 +11,7 @@
  */
 
 #include <config.h>
+#include <cpu_func.h>
 #include <env.h>
 #include <hang.h>
 #include <malloc.h>
@@ -399,7 +400,7 @@ static int mcffec_send(struct udevice *dev, void *packet, int length)
 #endif
 
 #ifdef CONFIG_SYS_UNIFY_CACHE
-       icache_invalid();
+       invalidate_icache_all();
 #endif
 
        j = 0;
@@ -433,7 +434,7 @@ static int mcffec_recv(struct udevice *dev, int flags, uchar **packetp)
 
        for (;;) {
 #ifdef CONFIG_SYS_UNIFY_CACHE
-               icache_invalid();
+               invalidate_icache_all();
 #endif
                /* If nothing received - leave for() loop */
                if (info->rxbd[info->rx_idx].cbd_sc & BD_ENET_RX_EMPTY)