Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc645a02 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Rename SH-3 CCR3 reg to avoid synclink_cs clash. 



drivers/char/pcmcia/synclink_cs.c:284:1: warning: "CCR3" 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:38:1: warning: this is the location of the previous definition

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent bfa274e2

arch/sh/kernel/cpu/sh3/probe.c

+2 −2
Original line number Diff line number Diff line
@@ -94,9 +94,9 @@ int __uses_jump_to_uncached detect_cpu_and_cache_system(void) 
		boot_cpu_data.dcache.way_incr	= (1 << 13);

		boot_cpu_data.dcache.entry_mask	= 0x1ff0;

		boot_cpu_data.dcache.sets	= 512;

		ctrl_outl(CCR_CACHE_32KB, CCR3);

		ctrl_outl(CCR_CACHE_32KB, CCR3_REG);

#else

		ctrl_outl(CCR_CACHE_16KB, CCR3);

		ctrl_outl(CCR_CACHE_16KB, CCR3_REG);

#endif

#endif

	}

include/asm-sh/cpu-sh3/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
    defined(CONFIG_CPU_SUBTYPE_SH7710) || \

    defined(CONFIG_CPU_SUBTYPE_SH7720) || \

    defined(CONFIG_CPU_SUBTYPE_SH7721)

#define CCR3	0xa40000b4

#define CCR3_REG	0xa40000b4

#define CCR_CACHE_16KB  0x00010000

#define CCR_CACHE_32KB	0x00020000

#endif