diff --git a/[refs] b/[refs]
index e33d692243a2..ee8f263383db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f5ec0a57ef503e7609d763cadba55f12b9486ce
+refs/heads/master: 69e351d029985a31abd41b2b8729788a01e8588d
diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig
index ccaea6aecea0..ff674c5f2d03 100644
--- a/trunk/arch/arm/mach-shmobile/Kconfig
+++ b/trunk/arch/arm/mach-shmobile/Kconfig
@@ -53,6 +53,7 @@ config ARCH_R8A7779
 
 config ARCH_R8A7790
 	bool "R-Car H2 (R8A77900)"
+	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/r8a7790.h b/trunk/arch/arm/mach-shmobile/include/mach/r8a7790.h
index f38ded61285f..9bd6f5c894bb 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/r8a7790.h
@@ -3,5 +3,6 @@
 
 void r8a7790_add_standard_devices(void);
 void r8a7790_clock_init(void);
+void r8a7790_pinmux_init(void);
 
 #endif /* __ASM_R8A7790_H__ */
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7790.c b/trunk/arch/arm/mach-shmobile/setup-r8a7790.c
index 9b4ccd7b5031..481201a4f3f5 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -29,6 +29,16 @@
 #include <mach/r8a7790.h>
 #include <asm/mach/arch.h>
 
+static const struct resource pfc_resources[] = {
+	DEFINE_RES_MEM(0xe6060000, 0x250),
+};
+
+void __init r8a7790_pinmux_init(void)
+{
+	platform_device_register_simple("pfc-r8a7790", -1, pfc_resources,
+					ARRAY_SIZE(pfc_resources));
+}
+
 #define SCIF_COMMON(scif_type, baseaddr, irq)			\
 	.type		= scif_type,				\
 	.mapbase	= baseaddr,				\