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

Conflicts:
	arch/sh/Kconfig

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

diff --cc arch/sh/Kconfig
index 65bdb5da79c5a690949e3337a56bf547cc533b87,ff9e033ce626774fe5b0ad7ddf1c199fe7789471,5970ae4c72ce1aeb676a46e5dfb7696423a663e2..182384d5d1e09dbc2ad139ce57c52703d9d7748a
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
--- 3/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 414a797f3be5af5f7c29c3ad4eb95fcdec9cbe3b,d893411022d53868a6d40baded1b55b8314d4081,7ee04984b8f2a4248245532e943ef3d147819748..3a74b10922e6cd8e551c812a9dc572322f2c3eae
--- 1/arch/sh/boards/Kconfig
--- 2/arch/sh/boards/Kconfig
--- 3/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 858b716ca64dcbf7d795486baa7fecf0d2b0404c,a229c393826ac116e64e48597ac011510ffc4102,21f8342822ac9d417ab3c7fcbbb2c1c08df1d1fe..793b664ef7ffd162933339243c2e4463b23f58a3
--- 1/arch/sh/include/asm/processor.h
--- 2/arch/sh/include/asm/processor.h
--- 3/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 27dd6f915eaea1abe68aa78ec826b91b21bceba8,f47be8727b3bc9b41f930ea7938679df2e21f001,6ffb06f2de628e4b332c4830cbf8875ae712da0e..9e6624c9108bcf77bbc525909195c2a0cb6e5d69
--- 1/arch/sh/kernel/cpu/proc.c
--- 2/arch/sh/kernel/cpu/proc.c
--- 3/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",