From 8d5fb297cc8f9f7de2840864e497bc38330abba6 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 8 Nov 2007 18:44:09 +0900 Subject: sh: Split out cache status bits per-CPU family. Signed-off-by: Paul Mundt --- include/asm-sh/cpu-sh2a/cache.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/asm-sh/cpu-sh2a/cache.h') diff --git a/include/asm-sh/cpu-sh2a/cache.h b/include/asm-sh/cpu-sh2a/cache.h index 3e4b9e4..d887741 100644 --- a/include/asm-sh/cpu-sh2a/cache.h +++ b/include/asm-sh/cpu-sh2a/cache.h @@ -12,6 +12,11 @@ #define L1_CACHE_SHIFT 4 +#define SH_CACHE_VALID 1 +#define SH_CACHE_UPDATED 2 +#define SH_CACHE_COMBINED 4 +#define SH_CACHE_ASSOC 8 + #define CCR1 0xfffc1000 #define CCR2 0xfffc1004 -- cgit v1.1 From 3ee7702903c346fc814bd7540ba37eebef75054d Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 28 Nov 2007 15:56:27 +0900 Subject: sh: CCR1->CCR renaming for SH-2 parts. Avoid namespace collision with a CCR1 definition. The general SH code always expects CCR anyways, so there's no point in keeping the CCR1 naming around. Fixes up synclink collisions: drivers/char/pcmcia/synclink_cs.c:283:1: warning: "CCR1" redefined In file included from include/asm/cache.h:13, from include/asm/processor_32.h:15, from include/asm/processor.h:60, from include/linux/prefetch.h:14, from include/linux/list.h:8, from include/linux/module.h:9, from drivers/char/pcmcia/synclink_cs.c:38: include/asm/cpu/cache.h:21:1: warning: this is the location of the previous definition Reported-by: Andrew Morton Signed-off-by: Paul Mundt --- include/asm-sh/cpu-sh2a/cache.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/asm-sh/cpu-sh2a/cache.h') diff --git a/include/asm-sh/cpu-sh2a/cache.h b/include/asm-sh/cpu-sh2a/cache.h index d887741..afe228b 100644 --- a/include/asm-sh/cpu-sh2a/cache.h +++ b/include/asm-sh/cpu-sh2a/cache.h @@ -17,12 +17,9 @@ #define SH_CACHE_COMBINED 4 #define SH_CACHE_ASSOC 8 -#define CCR1 0xfffc1000 +#define CCR 0xfffc1000 /* CCR1 */ #define CCR2 0xfffc1004 -/* CCR1 behaves more like the traditional CCR */ -#define CCR CCR1 - /* * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not * listed here are reserved. @@ -41,4 +38,3 @@ #define CCR_CACHE_INVALIDATE (CCR_CACHE_OCI | CCR_CACHE_ICI) #endif /* __ASM_CPU_SH2A_CACHE_H */ - -- cgit v1.1