From c7decc950c66f788b9ef06efba596f22cd5f2184 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 26 Mar 2013 10:34:52 +0900
Subject: [PATCH] --- yaml --- r: 373805 b: refs/heads/master c:
 d313d068d4b5801ea9c0c66bed66f37c64ad6807 h: refs/heads/master i:   373803:
 8c25ac23a116dbc9588baa5204a6e43b87b27e48 v: v3

---
 [refs]                                              |  2 +-
 trunk/arch/arm/mach-shmobile/Kconfig                |  1 +
 trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h |  1 +
 trunk/arch/arm/mach-shmobile/setup-r8a73a4.c        | 10 ++++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0faef3493548..f3c25cac97e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 984ca295010ad0113b986a404931566f9b1791d4
+refs/heads/master: d313d068d4b5801ea9c0c66bed66f37c64ad6807
diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig
index 17a59cde826e..0e4a820bcbe8 100644
--- a/trunk/arch/arm/mach-shmobile/Kconfig
+++ b/trunk/arch/arm/mach-shmobile/Kconfig
@@ -20,6 +20,7 @@ config ARCH_SH73A0
 
 config ARCH_R8A73A4
 	bool "R-Mobile APE6 (R8A73A40)"
+	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARM_GIC
 	select CPU_V7
 	select ARM_ARCH_TIMER
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h
index 6db3495479d8..f043103e32c9 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h
@@ -3,5 +3,6 @@
 
 void r8a73a4_add_standard_devices(void);
 void r8a73a4_clock_init(void);
+void r8a73a4_pinmux_init(void);
 
 #endif /* __ASM_R8A73A4_H__ */
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a73a4.c b/trunk/arch/arm/mach-shmobile/setup-r8a73a4.c
index da5ae1611518..c2d86f30cde4 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -28,6 +28,16 @@
 #include <mach/r8a73a4.h>
 #include <asm/mach/arch.h>
 
+static const struct resource pfc_resources[] = {
+	DEFINE_RES_MEM(0xe6050000, 0x9000),
+};
+
+void __init r8a73a4_pinmux_init(void)
+{
+	platform_device_register_simple("pfc-r8a73a4", -1, pfc_resources,
+					ARRAY_SIZE(pfc_resources));
+}
+
 #define SCIF_COMMON(scif_type, baseaddr, irq)			\
 	.type		= scif_type,				\
 	.mapbase	= baseaddr,				\