Commit 3ee77029 authored by Paul Mundt's avatar Paul Mundt

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 66d485b4
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
#define SH_CACHE_ASSOC 8 #define SH_CACHE_ASSOC 8
#if defined(CONFIG_CPU_SUBTYPE_SH7619) #if defined(CONFIG_CPU_SUBTYPE_SH7619)
#define CCR1 0xffffffec #define CCR 0xffffffec
#define CCR CCR1
#define CCR_CACHE_CE 0x01 /* Cache enable */ #define CCR_CACHE_CE 0x01 /* Cache enable */
#define CCR_CACHE_WT 0x06 /* CCR[bit1=1,bit2=1] */ #define CCR_CACHE_WT 0x06 /* CCR[bit1=1,bit2=1] */
......
...@@ -17,12 +17,9 @@ ...@@ -17,12 +17,9 @@
#define SH_CACHE_COMBINED 4 #define SH_CACHE_COMBINED 4
#define SH_CACHE_ASSOC 8 #define SH_CACHE_ASSOC 8
#define CCR1 0xfffc1000 #define CCR 0xfffc1000 /* CCR1 */
#define CCR2 0xfffc1004 #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 * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not
* listed here are reserved. * listed here are reserved.
...@@ -41,4 +38,3 @@ ...@@ -41,4 +38,3 @@
#define CCR_CACHE_INVALIDATE (CCR_CACHE_OCI | CCR_CACHE_ICI) #define CCR_CACHE_INVALIDATE (CCR_CACHE_OCI | CCR_CACHE_ICI)
#endif /* __ASM_CPU_SH2A_CACHE_H */ #endif /* __ASM_CPU_SH2A_CACHE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment