Merge branch 'sh/rsk-updates' into sh-latest

Conflicts:
	arch/sh/Kconfig

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

1 files changed, 9 insertions, 1 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 98405fa24e81..65bdb5da79c5 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -288,6 +288,13 @@ config CPU_SUBTYPE_SH7263
         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_MXG
         bool "Support MX-G processor"
         select CPU_SH2A
@@ -594,7 +601,8 @@ config SH_CLK_CPG
 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_SUBTYPE_SH7734
+                      !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \
+                      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264
 
 source "kernel/time/Kconfig"