From a14e8a58991a9ca8978b06873ff880a2d618cd5c Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Sat, 15 Dec 2012 23:51:07 +0100
Subject: [PATCH] --- yaml --- r: 355361 b: refs/heads/master c:
 fb872fcc71ee36060e8506eb089c93079880843a h: refs/heads/master i:   355359:
 627ab6c0a788d9d48b3e901b15b04334b0331025 v: v3

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

diff --git a/[refs] b/[refs]
index 245dd41dcf93..fe30519079ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5946e7bb4401b2b8b8803c9193c569613ab1faa2
+refs/heads/master: fb872fcc71ee36060e8506eb089c93079880843a
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 0626044bd866..b934d7d00c7b 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -305,6 +305,7 @@ config CPU_SUBTYPE_SH7269
 	select CPU_HAS_FPU
 	select SYS_SUPPORTS_CMT
 	select SYS_SUPPORTS_MTU2
+	select PINCTRL
 
 config CPU_SUBTYPE_MXG
 	bool "Support MX-G processor"
diff --git a/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c b/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c
index 1289fd922c72..525da4cc83c3 100644
--- a/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c
+++ b/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7269.h>
 
 enum {
@@ -2834,6 +2835,6 @@ static struct pinmux_info sh7269_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7269_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7269_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);