diff options
-rw-r--r-- | include/asm-sh/cpu-sh2/cache.h | 3 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/cache.h | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-sh/cpu-sh2/cache.h b/include/asm-sh/cpu-sh2/cache.h index 66388ce16c30..4e0b16500686 100644 --- a/include/asm-sh/cpu-sh2/cache.h +++ b/include/asm-sh/cpu-sh2/cache.h | |||
@@ -18,8 +18,7 @@ | |||
18 | #define SH_CACHE_ASSOC 8 | 18 | #define SH_CACHE_ASSOC 8 |
19 | 19 | ||
20 | #if defined(CONFIG_CPU_SUBTYPE_SH7619) | 20 | #if defined(CONFIG_CPU_SUBTYPE_SH7619) |
21 | #define CCR1 0xffffffec | 21 | #define CCR 0xffffffec |
22 | #define CCR CCR1 | ||
23 | 22 | ||
24 | #define CCR_CACHE_CE 0x01 /* Cache enable */ | 23 | #define CCR_CACHE_CE 0x01 /* Cache enable */ |
25 | #define CCR_CACHE_WT 0x06 /* CCR[bit1=1,bit2=1] */ | 24 | #define CCR_CACHE_WT 0x06 /* CCR[bit1=1,bit2=1] */ |
diff --git a/include/asm-sh/cpu-sh2a/cache.h b/include/asm-sh/cpu-sh2a/cache.h index d88774169b58..afe228b3f493 100644 --- a/include/asm-sh/cpu-sh2a/cache.h +++ b/include/asm-sh/cpu-sh2a/cache.h | |||
@@ -17,12 +17,9 @@ | |||
17 | #define SH_CACHE_COMBINED 4 | 17 | #define SH_CACHE_COMBINED 4 |
18 | #define SH_CACHE_ASSOC 8 | 18 | #define SH_CACHE_ASSOC 8 |
19 | 19 | ||
20 | #define CCR1 0xfffc1000 | 20 | #define CCR 0xfffc1000 /* CCR1 */ |
21 | #define CCR2 0xfffc1004 | 21 | #define CCR2 0xfffc1004 |
22 | 22 | ||
23 | /* CCR1 behaves more like the traditional CCR */ | ||
24 | #define CCR CCR1 | ||
25 | |||
26 | /* | 23 | /* |
27 | * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not | 24 | * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not |
28 | * listed here are reserved. | 25 | * listed here are reserved. |
@@ -41,4 +38,3 @@ | |||
41 | #define CCR_CACHE_INVALIDATE (CCR_CACHE_OCI | CCR_CACHE_ICI) | 38 | #define CCR_CACHE_INVALIDATE (CCR_CACHE_OCI | CCR_CACHE_ICI) |
42 | 39 | ||
43 | #endif /* __ASM_CPU_SH2A_CACHE_H */ | 40 | #endif /* __ASM_CPU_SH2A_CACHE_H */ |
44 | |||