From 627ab6c0a788d9d48b3e901b15b04334b0331025 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Sat, 15 Dec 2012 23:51:05 +0100
Subject: [PATCH] --- yaml --- r: 355359 b: refs/heads/master c:
 b768ecbc5129a11a83aff6f3240bc9c728600c98 h: refs/heads/master i:   355357:
 8da900140c470d0997ec0bcafa907b2a89799046   355355:
 da0d2d39705549192ad471c195fc0b2daf5ac4ea   355351:
 f79c0a361e37a74a37d4f576660401cbf9999df1   355343:
 14997473cc3b38056772ce1372767bf3c974ad5c   355327:
 ccd114e9823f0d5e49a62d8650eb47bfd03fa4fe v: v3

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

diff --git a/[refs] b/[refs]
index 9111202050f0..23361495baeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fdff1dc26fc0f50be2c64656229efca2e9de8c5
+refs/heads/master: b768ecbc5129a11a83aff6f3240bc9c728600c98
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index babc2b826c5c..023b2adead62 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -276,6 +276,7 @@ config CPU_SUBTYPE_SH7203
 	select SYS_SUPPORTS_CMT
 	select SYS_SUPPORTS_MTU2
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select PINCTRL
 
 config CPU_SUBTYPE_SH7206
 	bool "Support SH7206 processor"
diff --git a/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c b/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c
index c465af7283fc..814926e1895e 100644
--- a/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c
+++ b/trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7203.h>
 
 enum {
@@ -1592,6 +1593,6 @@ static struct pinmux_info sh7203_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7203_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7203_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);