---

yaml --- r: 355370 b: refs/heads/master c: 3e347f0 h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · 3afb8c7 · 3afb8c7
1 parent a652252
commit 3afb8c7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0fdbff91b4d7e0a594adbc92964f07d71adf6b2
+refs/heads/master: 3e347f08aab1bee4187fcda482ebde49090c4844
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -515,6 +515,7 @@ config CPU_SUBTYPE_SHX3
 	select CPU_SHX3
 	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
 	select ARCH_REQUIRE_GPIOLIB
+	select PINCTRL
 
 # SH4AL-DSP Processor Support
 

diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/shx3.h>
 
 enum {
@@ -582,6 +583,6 @@ static struct pinmux_info shx3_pinmux_info = {
 
 static int __init shx3_pinmux_setup(void)
 {
-	return register_pinmux(&shx3_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &shx3_pinmux_info);
 }
 arch_initcall(shx3_pinmux_setup);