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

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

diff --git a/[refs] b/[refs]
index 5ffe598575eb..3659ce227857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c17218257dc948a4c0b89de900eab0261ac0f77
+refs/heads/master: eb61b772af3678ba5aed5f6c9cc4dc072076b9f7
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 7a7d2ec7dc53..c99193f68569 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -467,6 +467,7 @@ config CPU_SUBTYPE_SH7757
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select USB_ARCH_HAS_OHCI
 	select USB_ARCH_HAS_EHCI
+	select PINCTRL
 	help
 	  Select SH7757 if you have a SH4A SH7757 CPU.
 
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
index 4a2736d52392..784b42895045 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <cpu/pfc.h>
 #include <cpu/sh7757.h>
 
 enum {
@@ -2282,6 +2283,6 @@ static struct pinmux_info sh7757_pinmux_info = {
 
 static int __init plat_pinmux_setup(void)
 {
-	return register_pinmux(&sh7757_pinmux_info);
+	return sh_pfc_register_info(NULL, NULL, 0, &sh7757_pinmux_info);
 }
 arch_initcall(plat_pinmux_setup);