From e422b1ba15b6156d45c9d7f88e6920b56ab66a3e Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Fri, 29 Mar 2013 17:00:12 +0900
Subject: [PATCH] --- yaml --- r: 373865 b: refs/heads/master c:
 2c56055c46502f24097de93aabc8a4c00e12dab4 h: refs/heads/master i:   373863:
 ada3e6a112fd5a608013fd262ca116f2924927c2 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/mach-shmobile/board-ape6evm.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 508b7326621d..e21258f85fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78ded16886f539830ed58d9bc043656c1785a082
+refs/heads/master: 2c56055c46502f24097de93aabc8a4c00e12dab4
diff --git a/trunk/arch/arm/mach-shmobile/board-ape6evm.c b/trunk/arch/arm/mach-shmobile/board-ape6evm.c
index 9234d4f567ba..33a8a62437f1 100644
--- a/trunk/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/trunk/arch/arm/mach-shmobile/board-ape6evm.c
@@ -21,15 +21,25 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip.h>
 #include <linux/kernel.h>
+#include <linux/pinctrl/machine.h>
 #include <linux/platform_device.h>
 #include <mach/common.h>
 #include <mach/r8a73a4.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+static const struct pinctrl_map ape6evm_pinctrl_map[] = {
+	/* SCIFA0 console */
+	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4",
+				  "scifa0_data", "scifa0"),
+};
+
 static void __init ape6evm_add_standard_devices(void)
 {
 	r8a73a4_clock_init();
+	pinctrl_register_mappings(ape6evm_pinctrl_map,
+				  ARRAY_SIZE(ape6evm_pinctrl_map));
+	r8a73a4_pinmux_init();
 	r8a73a4_add_standard_devices();
 }