From a652252eb686a6b654b67e969727fcb6c34c48cc Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Sat, 15 Dec 2012 23:51:15 +0100
Subject: [PATCH] --- yaml --- r: 355369 b: refs/heads/master c:
 c0fdbff91b4d7e0a594adbc92964f07d71adf6b2 h: refs/heads/master i:   355367:
 3fa22c6f692fad8b45261e585819174c2dcbf174 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/sh/Kconfig                         | 1 +
 trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ed447a089619..c53b81208089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77bd27b240a517f3fa218d672cac1906b7e3a448
+refs/heads/master: c0fdbff91b4d7e0a594adbc92964f07d71adf6b2
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 7d5bc1df1a95..27f0b7306932 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -507,6 +507,7 @@ config CPU_SUBTYPE_SH7786
 	select USB_OHCI_SH if USB_OHCI_HCD
 	select USB_ARCH_HAS_EHCI
 	select USB_EHCI_SH if USB_EHCI_HCD
+	select PINCTRL
 
 config CPU_SUBTYPE_SHX3
 	bool "Support SH-X3 processor"
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
index 60df99c7bc26..be876b0f1ad0 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7786.h>
 
 enum {
@@ -837,7 +838,7 @@ static struct pinmux_info sh7786_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7786_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7786_pinmux_info);
 }
 
 arch_initcall(plat_pinmux_setup);