Merge branch 'cleanups' into next

[platform/kernel/u-boot.git] / lib_blackfin / cache.c

diff --git a/lib_blackfin/cache.c b/lib_blackfin/cache.c
index 41e2a62..1557864 100644 (file)
--- a/lib_blackfin/cache.c
+++ b/lib_blackfin/cache.c
@@ -15,15 +15,25 @@
 
 void flush_cache(unsigned long addr, unsigned long size)
 {
+       void *start_addr, *end_addr;
+       int istatus, dstatus;
+
        /* no need to flush stuff in on chip memory (L1/L2/etc...) */
        if (addr >= 0xE0000000)
                return;
 
-       if (icache_status())
-               blackfin_icache_flush_range((void *)addr, (void *)(addr + size));
+       start_addr = (void *)addr;
+       end_addr = (void *)(addr + size);
+       istatus = icache_status();
+       dstatus = dcache_status();
 
-       if (dcache_status())
-               blackfin_dcache_flush_range((void *)addr, (void *)(addr + size));
+       if (istatus) {
+               if (dstatus)
+                       blackfin_icache_dcache_flush_range(start_addr, end_addr);
+               else
+                       blackfin_icache_flush_range(start_addr, end_addr);
+       } else if (dstatus)
+               blackfin_dcache_flush_range(start_addr, end_addr);
 }
 
 void icache_enable(void)
@@ -40,7 +50,7 @@ void icache_disable(void)
 
 int icache_status(void)
 {
-       return bfin_read_IMEM_CONTROL() & ENICPLB;
+       return bfin_read_IMEM_CONTROL() & IMC;
 }
 
 void dcache_enable(void)
@@ -57,5 +67,5 @@ void dcache_disable(void)
 
 int dcache_status(void)
 {
-       return bfin_read_DMEM_CONTROL() & ENDCPLB;
+       return bfin_read_DMEM_CONTROL() & ACACHE_BCACHE;
 }