---

yaml --- r: 373865 b: refs/heads/master c: 2c56055 h: refs/heads/master i: 373863: ada3e6a v: v3
git-mirror · Apr 3, 2013 · e422b1b · e422b1b
1 parent 2a1acdc
commit e422b1b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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();
 }