ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference

GPIOs can be provided by the pinctrl subsystem, which can be initialised
by DT. Therefore DT has to be parsed before requesting GPIOs. Also non-DT
pinmux has to be configured early.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index 6a1222e177d343a1f7b866fa278363e93eb689d9..e3341529439e53e41f36d053fa9eb66b41524d79 100644 (file)
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -34,6 +34,9 @@
 
 static void __init kzm_init(void)
 {
+       sh73a0_add_standard_devices_dt();
+       sh73a0_pinmux_init();
+
        /* enable SCIFA4 */
        gpio_request(GPIO_FN_SCIFA4_TXD, NULL);
        gpio_request(GPIO_FN_SCIFA4_RXD, NULL);
@@ -60,8 +63,6 @@ static void __init kzm_init(void)
        /* Early BRESP enable, Shared attribute override enable, 64K*8way */
        l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff);
 #endif
-
-       sh73a0_add_standard_devices_dt();
 }
 
 static void kzm9g_restart(char mode, const char *cmd)