From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 10 May 2012 08:20:56 +0000 (+0900)
Subject: Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bcb86e0adb6397013616567249d2d82f94b27891;p=linux-beck.git

Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest

Conflicts:
	arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

bcb86e0adb6397013616567249d2d82f94b27891
diff --cc arch/sh/Kconfig
index 65bdb5da79c5,ff9e033ce626,5970ae4c72ce..182384d5d1e0
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@@ -288,13 -288,6 -288,20 +288,20 @@@@ config CPU_SUBTYPE_SH726
   	select SYS_SUPPORTS_CMT
   	select SYS_SUPPORTS_MTU2
   
 + config CPU_SUBTYPE_SH7264
 + 	bool "Support SH7264 processor"
 + 	select CPU_SH2A
 + 	select CPU_HAS_FPU
 + 	select SYS_SUPPORTS_CMT
 + 	select SYS_SUPPORTS_MTU2
 + 
++ config CPU_SUBTYPE_SH7269
++ 	bool "Support SH7269 processor"
++ 	select CPU_SH2A
++ 	select CPU_HAS_FPU
++ 	select SYS_SUPPORTS_CMT
++ 	select SYS_SUPPORTS_MTU2
++ 
   config CPU_SUBTYPE_MXG
   	bool "Support MX-G processor"
   	select CPU_SH2A
@@@@ -601,8 -584,7 -598,8 +608,9 @@@@ config SH_CLK_CP
   config SH_CLK_CPG_LEGACY
   	depends on SH_CLK_CPG
   	def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
 - 		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757
 + 		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \
-  		      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264
  -		      !CPU_SUBTYPE_SH7264 && !CPU_SUBTYPE_SH7269
+++		      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \
+++		      !CPU_SUBTYPE_SH7269
   
   source "kernel/time/Kconfig"
   
diff --cc arch/sh/boards/Kconfig
index 414a797f3be5,d893411022d5,7ee04984b8f2..3a74b10922e6
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@@@ -133,7 -133,7 -133,8 +133,8 @@@@ config SH_RTS7751R2
   
   config SH_RSK
   	bool "Renesas Starter Kit"
-  	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7264
 - 	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203
++ 	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \
++ 	  CPU_SUBTYPE_SH7264 || CPU_SUBTYPE_SH7269
   	help
   	 Select this option if configuring for any of the RSK+ MCU
   	 evaluation platforms.
diff --cc arch/sh/include/asm/processor.h
index 858b716ca64d,a229c393826a,21f8342822ac..793b664ef7ff
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@@@ -18,7 -18,7 -18,8 +18,8 @@@@ enum cpu_type 
   	CPU_SH7619,
   
   	/* SH-2A types */
-  	CPU_SH7201, CPU_SH7203, CPU_SH7206, CPU_SH7263, CPU_SH7264, CPU_MXG,
 - 	CPU_SH7201, CPU_SH7203, CPU_SH7206, CPU_SH7263, CPU_MXG,
++ 	CPU_SH7201, CPU_SH7203, CPU_SH7206, CPU_SH7263, CPU_SH7264, CPU_SH7269,
++ 	CPU_MXG,
   
   	/* SH-3 types */
   	CPU_SH7705, CPU_SH7706, CPU_SH7707,
diff --cc arch/sh/kernel/cpu/proc.c
index 27dd6f915eae,f47be8727b3b,6ffb06f2de62..9e6624c9108b
--- a/arch/sh/kernel/cpu/proc.c
+++ b/arch/sh/kernel/cpu/proc.c
@@@@ -7,7 -7,6 -7,7 +7,7 @@@@
   static const char *cpu_name[] = {
   	[CPU_SH7201]	= "SH7201",
   	[CPU_SH7203]	= "SH7203",	[CPU_SH7263]	= "SH7263",
-  	[CPU_SH7264]	= "SH7264",
++ 	[CPU_SH7264]	= "SH7264",	[CPU_SH7269]	= "SH7269",
   	[CPU_SH7206]	= "SH7206",	[CPU_SH7619]	= "SH7619",
   	[CPU_SH7705]	= "SH7705",	[CPU_SH7706]	= "SH7706",
   	[CPU_SH7707]	= "SH7707",	[CPU_SH7708]	= "SH7708",