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

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

diff --git a/[refs] b/[refs]
index 23361495baeb..245dd41dcf93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b768ecbc5129a11a83aff6f3240bc9c728600c98
+refs/heads/master: 5946e7bb4401b2b8b8803c9193c569613ab1faa2
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 023b2adead62..0626044bd866 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -297,6 +297,7 @@ config CPU_SUBTYPE_SH7264
 	select CPU_HAS_FPU
 	select SYS_SUPPORTS_CMT
 	select SYS_SUPPORTS_MTU2
+	select PINCTRL
 
 config CPU_SUBTYPE_SH7269
 	bool "Support SH7269 processor"
diff --git a/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c b/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c
index 79a0d6097f29..ed9fc39daa61 100644
--- a/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c
+++ b/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7264.h>
 
 enum {
@@ -2131,6 +2132,6 @@ static struct pinmux_info sh7264_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7264_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7264_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);