From cf29e21025205d940e85f1a3e9ddaf4f02417ccc Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Sat, 15 Dec 2012 23:51:14 +0100
Subject: [PATCH] --- yaml --- r: 355368 b: refs/heads/master c:
 77bd27b240a517f3fa218d672cac1906b7e3a448 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3659ce227857..ed447a089619 100644
--- 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
index c99193f68569..7d5bc1df1a95 100644
--- 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
index 5ebc25fd9b2a..da0bd79c49bf 100644
--- 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);