ARM: shmobile: r8a7740: Add pin control device to device tree

Add a pfc node to the r8a7740 device tree and remove manual pinmux
initialization from the corresponding board files.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 24e93064382116b3c8dc7b8e5b11df4b1c5c9133..e18a195b55f3c7fb7220a9ccdc8dd60b415474ed 100644 (file)
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -139,4 +139,12 @@
                              0 72 0x4
                              0 73 0x4>;
        };
+
+       pfc: pfc@e6050000 {
+               compatible = "renesas,pfc-r8a7740";
+               reg = <0xe6050000 0x8000>,
+                     <0xe605800c 0x20>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
 };

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 03b85fec2ddbea46eedeb725a206a6fa6bd73e2b..f25b6aaba2a0e8d887ebda5c2f9ddf493352c655 100644 (file)
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -121,7 +121,7 @@
 
 static const struct pinctrl_map eva_pinctrl_map[] = {
        /* SCIFA1 */
-       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
+       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "e6050000.pfc",
                                  "scifa1_data", "scifa1"),
 };
 
@@ -170,22 +170,22 @@ static void __init eva_init(void)
        eva_clock_init();
 
        pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
-       r8a7740_pinmux_init();
 
        r8a7740_meram_workaround();
 
-       /*
-        * Touchscreen
-        * TODO: Move reset GPIO over to .dts when we can reference it
-        */
-       gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
-
 #ifdef CONFIG_CACHE_L2X0
        /* Early BRESP enable, Shared attribute override enable, 32K*8way */
        l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
 #endif
 
        r8a7740_add_standard_devices_dt();
+
+       /*
+        * Touchscreen
+        * TODO: Move reset GPIO over to .dts when we can reference it
+        */
+       gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
+
        r8a7740_pm_init();
 }