---

yaml --- r: 355359 b: refs/heads/master c: b768ecb h: refs/heads/master i: 355357: 8da9001 355355: da0d2d3 355351: f79c0a3 355343: 1499747 355327: ccd114e v: v3
git-mirror · Jan 25, 2013 · 627ab6c · 627ab6c
1 parent 155a677
commit 627ab6c
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: 8fdff1dc26fc0f50be2c64656229efca2e9de8c5
+refs/heads/master: b768ecbc5129a11a83aff6f3240bc9c728600c98
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -276,6 +276,7 @@ config CPU_SUBTYPE_SH7203
 	select SYS_SUPPORTS_CMT
 	select SYS_SUPPORTS_MTU2
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select PINCTRL
 
 config CPU_SUBTYPE_SH7206
 	bool "Support SH7206 processor"

diff --git a/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c b/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7203.h>
 
 enum {
@@ -1592,6 +1593,6 @@ static struct pinmux_info sh7203_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7203_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7203_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);