From 200e21d83079e849063bd86e414b0a3f9dfab6f1 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Sat, 15 Dec 2012 23:51:11 +0100
Subject: [PATCH] --- yaml --- r: 355365 b: refs/heads/master c:
 18ebd2288419952fe908aa78ccf531f12d0ddfd8 h: refs/heads/master i:   355363:
 420e78b630c381df6e0f33649549982dd0293d22 v: v3

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

diff --git a/[refs] b/[refs]
index 3387b079310f..c65e697cc1d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16941a892ae0d40ad0f2053d80d4c1362e540946
+refs/heads/master: 18ebd2288419952fe908aa78ccf531f12d0ddfd8
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 89fb594debb8..18852130af1a 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -445,6 +445,7 @@ config CPU_SUBTYPE_SH7724
 	select ARCH_SPARSEMEM_ENABLE
 	select SYS_SUPPORTS_CMT
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select PINCTRL
 	help
 	  Select SH7724 if you have an SH-MobileR2R CPU.
 
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c
index 1af0f9586379..51000f9a940f 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7724.h>
 
 enum {
@@ -2225,6 +2226,6 @@ static struct pinmux_info sh7724_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7724_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7724_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);