a5f6ea29f9
Commit bcf24e1daa ("mmc: omap_hsmmc: use the generic config for
omap2plus devices"), enabled the build for other platforms for compile
testing.
sh-allmodconfig now fails with:
include/linux/omap-dma.h:171:8: error: expected identifier before numeric constant
make[4]: *** [drivers/mmc/host/omap_hsmmc.o] Error 1
This happens because SuperH #defines "CCR", which is one of the enum
values in include/linux/omap-dma.h. There's a similar issue with "CCR2"
on sh2a.
As "CCR" and "CCR2" are too generic names for global #defines, prefix
them with "SH_" to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
44 lines
1.3 KiB
C
44 lines
1.3 KiB
C
/*
|
|
* include/asm-sh/cpu-sh2/cache.h
|
|
*
|
|
* Copyright (C) 2003 Paul Mundt
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
#ifndef __ASM_CPU_SH2_CACHE_H
|
|
#define __ASM_CPU_SH2_CACHE_H
|
|
|
|
#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
|
|
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7619)
|
|
#define SH_CCR 0xffffffec
|
|
|
|
#define CCR_CACHE_CE 0x01 /* Cache enable */
|
|
#define CCR_CACHE_WT 0x02 /* CCR[bit1=1,bit2=1] */
|
|
/* 0x00000000-0x7fffffff: Write-through */
|
|
/* 0x80000000-0x9fffffff: Write-back */
|
|
/* 0xc0000000-0xdfffffff: Write-through */
|
|
#define CCR_CACHE_CB 0x04 /* CCR[bit1=0,bit2=0] */
|
|
/* 0x00000000-0x7fffffff: Write-back */
|
|
/* 0x80000000-0x9fffffff: Write-through */
|
|
/* 0xc0000000-0xdfffffff: Write-back */
|
|
#define CCR_CACHE_CF 0x08 /* Cache invalidate */
|
|
|
|
#define CACHE_OC_ADDRESS_ARRAY 0xf0000000
|
|
#define CACHE_OC_DATA_ARRAY 0xf1000000
|
|
|
|
#define CCR_CACHE_ENABLE CCR_CACHE_CE
|
|
#define CCR_CACHE_INVALIDATE CCR_CACHE_CF
|
|
#define CACHE_PHYSADDR_MASK 0x1ffffc00
|
|
|
|
#endif
|
|
|
|
#endif /* __ASM_CPU_SH2_CACHE_H */
|