arm: mvebu: define and use common Armada 370 UART pinctrl settings

This patch defines common Armada 370 pinctrl settings for uart0 and
uart1 interfaces:

 uart0: MPP0-1 as default
 uart1: MPP41-42 as default

Note: this patch has the potential to break out-of-tree users w/o
specific pinctrl settings for their uart interfaces if the default
above does not match their config.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Link: https://lkml.kernel.org/r/31412e57955c98bc9cc47b70726b5072af945cc3.1416613429.git.arno@natisbad.org
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 49ac064d2f33c42e819fa732d32bccfc8c425147..fdb3c12a6139a7d334879f3a04f214285e9a465b 100644 (file)
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -154,6 +154,21 @@
                                interrupts = <91>;
                        };
 
+                       /*
+                        * Default UART pinctrl setting without RTS/CTS, can
+                        * be overwritten on board level if a different
+                        * configuration is used.
+                        */
+                       uart0: serial@12000 {
+                               pinctrl-0 = <&uart0_pins>;
+                               pinctrl-names = "default";
+                       };
+
+                       uart1: serial@12100 {
+                               pinctrl-0 = <&uart1_pins>;
+                               pinctrl-names = "default";
+                       };
+
                        system-controller@18200 {
                                compatible = "marvell,armada-370-xp-system-controller";
                                reg = <0x18200 0x100>;
@@ -282,6 +297,16 @@
                marvell,function = "spi1";
        };
 
+       uart0_pins: uart0-pins {
+               marvell,pins = "mpp0", "mpp1";
+               marvell,function = "uart0";
+       };
+
+       uart1_pins: uart1-pins {
+               marvell,pins = "mpp41", "mpp42";
+               marvell,function = "uart1";
+       };
+
        sdio_pins1: sdio-pins1 {
                marvell,pins = "mpp9",  "mpp11", "mpp12",
                                "mpp13", "mpp14", "mpp15";