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

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

diff --git a/[refs] b/[refs]
index 64802ad5ea19..3387b079310f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef97c3c1390aff67c44b61ca4b20d56c4284f38a
+refs/heads/master: 16941a892ae0d40ad0f2053d80d4c1362e540946
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 2f0d9bf7b038..89fb594debb8 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -433,6 +433,7 @@ config CPU_SUBTYPE_SH7723
 	select ARCH_SPARSEMEM_ENABLE
 	select SYS_SUPPORTS_CMT
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select PINCTRL
 	help
 	  Select SH7723 if you have an SH-MobileR2 CPU.
 
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c
index 2037915a6d3c..ba22b2ba4867 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7723.h>
 
 enum {
@@ -1903,7 +1904,7 @@ static struct pinmux_info sh7723_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7723_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7723_pinmux_info);
 }
 
 arch_initcall(plat_pinmux_setup);