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

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

diff --git a/[refs] b/[refs]
index f402cdbe54ff..64802ad5ea19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85db6bff7e64410b4810c5451ffa3e13ad4e1dab
+refs/heads/master: ef97c3c1390aff67c44b61ca4b20d56c4284f38a
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index bfb8b3ee6394..2f0d9bf7b038 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -527,6 +527,7 @@ config CPU_SUBTYPE_SH7722
 	select SYS_SUPPORTS_NUMA
 	select SYS_SUPPORTS_CMT
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select PINCTRL
 
 config CPU_SUBTYPE_SH7366
 	bool "Support SH7366 processor"
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
index 0688a7502f86..11dbce342884 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
@@ -1,6 +1,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7722.h>
 
 enum {
@@ -1778,7 +1779,7 @@ static struct pinmux_info sh7722_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7722_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7722_pinmux_info);
 }
 
 arch_initcall(plat_pinmux_setup);