---

yaml --- r: 355367 b: refs/heads/master c: eb61b77 h: refs/heads/master i: 355365: 200e21d 355363: 420e78b 355359: 627ab6c v: v3
git-mirror · Jan 25, 2013 · 3fa22c6 · 3fa22c6
1 parent 4b64219
commit 3fa22c6
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: 2c17218257dc948a4c0b89de900eab0261ac0f77
+refs/heads/master: eb61b772af3678ba5aed5f6c9cc4dc072076b9f7
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -467,6 +467,7 @@ config CPU_SUBTYPE_SH7757
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select USB_ARCH_HAS_OHCI
 	select USB_ARCH_HAS_EHCI
+	select PINCTRL
 	help
 	  Select SH7757 if you have a SH4A SH7757 CPU.
 

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