---

yaml --- r: 355368 b: refs/heads/master c: 77bd27b h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · cf29e21 · cf29e21
1 parent 3fa22c6
commit cf29e21
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: eb61b772af3678ba5aed5f6c9cc4dc072076b9f7
+refs/heads/master: 77bd27b240a517f3fa218d672cac1906b7e3a448
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -494,6 +494,7 @@ config CPU_SUBTYPE_SH7785
 	select ARCH_SPARSEMEM_ENABLE
 	select SYS_SUPPORTS_NUMA
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select PINCTRL
 
 config CPU_SUBTYPE_SH7786
 	bool "Support SH7786 processor"

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