---

yaml --- r: 305217 b: refs/heads/master c: 14f087d h: refs/heads/master i: 305215: 82c2e33 v: v3
git-mirror · Apr 10, 2012 · 0949956 · 0949956
1 parent b4c5810
commit 0949956
Show file tree

Hide file tree

Showing 58 changed files with 495 additions and 4,328 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 856cb4bb337ee50427e2b8daaf3a8d61de8a4f44
+refs/heads/master: 14f087d839d9bd3f90ad69d4b3fde7d236c156b1
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -6545,7 +6545,7 @@ M:	Paul Mundt <lethal@linux-sh.org>
 L:	linux-sh@vger.kernel.org
 W:	http://www.linux-sh.org
 Q:	http://patchwork.kernel.org/project/linux-sh/list/
-T:	git git://github.com/pmundt/linux-sh.git sh-latest
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
 S:	Supported
 F:	Documentation/sh/
 F:	arch/sh/

diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -427,16 +427,6 @@ config CPU_SUBTYPE_SH7724
 	help
 	  Select SH7724 if you have an SH-MobileR2R CPU.
 
-config CPU_SUBTYPE_SH7734
-	bool "Support SH7734 processor"
-	select CPU_SH4A
-	select CPU_SHX2
-	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select USB_ARCH_HAS_OHCI
-	select USB_ARCH_HAS_EHCI
-	help
-	  Select SH7734 if you have a SH4A SH7734 CPU.
-
 config CPU_SUBTYPE_SH7757
 	bool "Support SH7757 processor"
 	select CPU_SH4A
@@ -594,7 +584,7 @@ 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
 
 source "kernel/time/Kconfig"
 

diff --git a/trunk/arch/sh/include/asm/processor.h b/trunk/arch/sh/include/asm/processor.h
@@ -32,7 +32,7 @@ enum cpu_type {
 
 	/* SH-4A types */
 	CPU_SH7763, CPU_SH7770, CPU_SH7780, CPU_SH7781, CPU_SH7785, CPU_SH7786,
-	CPU_SH7723, CPU_SH7724, CPU_SH7757, CPU_SH7734, CPU_SHX3,
+	CPU_SH7723, CPU_SH7724, CPU_SH7757, CPU_SHX3,
 
 	/* SH4AL-DSP types */
 	CPU_SH7343, CPU_SH7722, CPU_SH7366, CPU_SH7372,

diff --git a/trunk/arch/sh/include/cpu-sh4/cpu/freq.h b/trunk/arch/sh/include/cpu-sh4/cpu/freq.h
@@ -47,11 +47,6 @@
 #define MSTPCR1			0xa4150034
 #define MSTPCR2			0xa4150038
 
-#elif defined(CONFIG_CPU_SUBTYPE_SH7734)
-#define FRQCR0			0xffc80000
-#define FRQCR2			0xffc80008
-#define FRQMR1			0xffc80014
-#define FRQMR2			0xffc80018
 #elif defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define FRQCR0			0xffc80000
 #define FRQCR1			0xffc80004

diff --git a/trunk/arch/sh/include/cpu-sh4/cpu/sh7734.h b/trunk/arch/sh/include/cpu-sh4/cpu/sh7734.h
diff --git a/trunk/arch/sh/kernel/cpu/proc.c b/trunk/arch/sh/kernel/cpu/proc.c
@@ -25,8 +25,7 @@ static const char *cpu_name[] = {
 	[CPU_SH5_101]	= "SH5-101",	[CPU_SH5_103]	= "SH5-103",
 	[CPU_MXG]	= "MX-G",	[CPU_SH7723]	= "SH7723",
 	[CPU_SH7366]	= "SH7366",	[CPU_SH7724]	= "SH7724",
-	[CPU_SH7372]	= "SH7372",	[CPU_SH7734]	= "SH7734",
-	[CPU_SH_NONE]	= "Unknown"
+	[CPU_SH7372]	= "SH7372",	[CPU_SH_NONE]	= "Unknown"
 };
 
 const char *get_cpu_subtype(struct sh_cpuinfo *c)