diff options
author | Greg Ungerer <gerg@snapgear.com> | 2008-02-01 02:38:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:00:01 -0500 |
commit | b7dcf7fe7c3060db38fc625efffad5965a5c6d8a (patch) | |
tree | 5d72dc3cd8cc062e7dfdeb8750da524f1b570f34 | |
parent | 9f69ba86d66297189916ceae401fe0944a207714 (diff) |
m68knommu: fix 528x ColdFire cache settings
Fix problems with the 528x ColdFire CPU cache setup.
Do not cache the flash region (if present), and make the runtime
settings consistent with the init setting.
Problems pointed out by Bernd Buttner <b.buettner@mkc-gmbh.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-m68knommu/cacheflush.h | 2 | ||||
-rw-r--r-- | include/asm-m68knommu/mcfcache.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-m68knommu/cacheflush.h b/include/asm-m68knommu/cacheflush.h index 163dcb1a9689..29bc0aad2ebc 100644 --- a/include/asm-m68knommu/cacheflush.h +++ b/include/asm-m68knommu/cacheflush.h | |||
@@ -53,7 +53,7 @@ static inline void __flush_cache_all(void) | |||
53 | #endif /* CONFIG_M5407 */ | 53 | #endif /* CONFIG_M5407 */ |
54 | #if defined(CONFIG_M527x) || defined(CONFIG_M528x) | 54 | #if defined(CONFIG_M527x) || defined(CONFIG_M528x) |
55 | __asm__ __volatile__ ( | 55 | __asm__ __volatile__ ( |
56 | "movel #0x81400100, %%d0\n\t" | 56 | "movel #0x81000200, %%d0\n\t" |
57 | "movec %%d0, %%CACR\n\t" | 57 | "movec %%d0, %%CACR\n\t" |
58 | "nop\n\t" | 58 | "nop\n\t" |
59 | : : : "d0" ); | 59 | : : : "d0" ); |
diff --git a/include/asm-m68knommu/mcfcache.h b/include/asm-m68knommu/mcfcache.h index 7b61a8a529f5..c042634fadaa 100644 --- a/include/asm-m68knommu/mcfcache.h +++ b/include/asm-m68knommu/mcfcache.h | |||
@@ -60,7 +60,7 @@ | |||
60 | nop | 60 | nop |
61 | movel #0x0000c020, %d0 /* Set SDRAM cached only */ | 61 | movel #0x0000c020, %d0 /* Set SDRAM cached only */ |
62 | movec %d0, %ACR0 | 62 | movec %d0, %ACR0 |
63 | movel #0xff00c000, %d0 /* Cache Flash also */ | 63 | movel #0x00000000, %d0 /* No other regions cached */ |
64 | movec %d0, %ACR1 | 64 | movec %d0, %ACR1 |
65 | movel #0x80000200, %d0 /* Setup cache mask */ | 65 | movel #0x80000200, %d0 /* Setup cache mask */ |
66 | movec %d0, %CACR /* Enable cache */ | 66 | movec %d0, %CACR /* Enable cache */ |