ARM: dts: kirkwood: set default pinctrl for UART0/1

Most boards use the default UART0/1 pinctrl setting without RTS/CTS.
Add the pinctrl setting to the toplevel SoC UART nodes and put a note
in front of the corresponding pinctrl node to overwrite the setting
on board level. Currently, both boards using a different UART pinctrl
setting (Openblocks A6, A7) already overwrite the pinctrl node.

While at it, also fix up some status = "ok" to "okay" and again
whitespace issues on mplcec4 uart nodes.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-10-git-send-email-sebastian.hesselbarth@gmail.comSigned-off-by: Jason Cooper <jason@lakedaemon.net>

arch/arm/boot/dts/kirkwood-b3.dts

@@ -114,8 +114,6 @@ serial@12000 {
 			 * UART0_TX = Testpoint 66
 			 * See the Excito Wiki for more details.
 		 	 */
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 

arch/arm/boot/dts/kirkwood-cloudbox.dts

@@ -26,8 +26,6 @@ pmx_cloudbox_sata0: pmx-cloudbox-sata0 {
 		};
 
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 

arch/arm/boot/dts/kirkwood-db.dtsi

@@ -34,9 +34,7 @@ pmx_sdio_gpios: pmx-sdio-gpios {
 		};
 
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
-			status = "ok";
+			status = "okay";
 		};
 
 		sata@80000 {

arch/arm/boot/dts/kirkwood-dns320.dts

@@ -52,8 +52,6 @@ serial@12000 {
 		};
 
 		serial@12100 {
-			pinctrl-0 = <&pmx_uart1>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 	};

arch/arm/boot/dts/kirkwood-laplug.dts

@@ -38,8 +38,6 @@ pcie@1,0 {
 
 	ocp@f1000000 {
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 

arch/arm/boot/dts/kirkwood-mplcec4.dts

@@ -90,11 +90,9 @@ eeprom@57 {
 
                 };
 
-                serial@12000 {
-                        status = "ok";
-                        pinctrl-0 = <&pmx_uart0>;
-                        pinctrl-names = "default";
-                };
+		serial@12000 {
+			status = "okay";
+		};
 
 		rtc@10300 {
 			status = "disabled";

arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts

@@ -65,9 +65,7 @@ flash@0 {
 		};
 
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
-			status = "ok";
+			status = "okay";
 		};
 
 		ehci@50000 {

arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts

@@ -113,8 +113,6 @@ g762: g762@3e {
 		};
 
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 

arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts

@@ -120,8 +120,6 @@ g762: g762@3e {
 		};
 
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 

arch/arm/boot/dts/kirkwood-ns2-common.dtsi

@@ -20,8 +20,6 @@ pmx_ns2_sata1: pmx-ns2-sata1 {
 		};
 
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 

arch/arm/boot/dts/kirkwood-openblocks_a6.dts

@@ -19,15 +19,11 @@ chosen {
 
 	ocp@f1000000 {
 		serial@12000 {
-			status = "ok";
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
+			status = "okay";
 		};
 
 		serial@12100 {
-			status = "ok";
-			pinctrl-0 = <&pmx_uart1>;
-			pinctrl-names = "default";
+			status = "okay";
 		};
 
 		sata@80000 {

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

@@ -31,15 +31,11 @@ chosen {
 
 	ocp@f1000000 {
 		serial@12000 {
-			status = "ok";
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
+			status = "okay";
 		};
 
 		serial@12100 {
-			status = "ok";
-			pinctrl-0 = <&pmx_uart1>;
-			pinctrl-names = "default";
+			status = "okay";
 		};
 
 		sata@80000 {

arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi

@@ -45,8 +45,6 @@ pmx_sdio_wp: pmx-sdio-wp {
 			};
 		};
 		serial@12000 {
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 			status = "okay";
 		};
 	};

arch/arm/boot/dts/kirkwood-synology.dtsi

@@ -277,14 +277,10 @@ s35390a: s35390a@30 {
 
 		serial@12000 {
 			status = "okay";
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 		};
 
 		serial@12100 {
 			status = "okay";
-			pinctrl-0 = <&pmx_uart1>;
-			pinctrl-names = "default";
 		};
 
 		poweroff@12100 {

arch/arm/boot/dts/kirkwood-topkick.dts

@@ -86,9 +86,7 @@ pmx_led_wifi_yellow: pmx-led-wifi-yellow {
 		};
 
 		serial@12000 {
-			status = "ok";
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
+			status = "okay";
 		};
 
 		sata@80000 {

arch/arm/boot/dts/kirkwood-ts219.dtsi

@@ -36,13 +36,9 @@ s35390a: s35390a@30 {
 		};
 		serial@12000 {
 			status = "okay";
-			pinctrl-0 = <&pmx_uart0>;
-			pinctrl-names = "default";
 		};
 		serial@12100 {
 			status = "okay";
-			pinctrl-0 = <&pmx_uart1>;
-			pinctrl-names = "default";
 		};
 		poweroff@12100 {
 			compatible = "qnap,power-off";

arch/arm/boot/dts/kirkwood.dtsi

@@ -98,6 +98,10 @@ pmx_twsi0: pmx-twsi0 {
 				marvell,function = "twsi0";
 			};
 
+			/*
+			 * Default UART pinctrl setting without RTS/CTS,
+			 * overwrite marvell,pins on board level if required.
+			 */
 			pmx_uart0: pmx-uart0 {
 				marvell,pins = "mpp10", "mpp11";
 				marvell,function = "uart0";
@@ -167,6 +171,8 @@ uart0: serial@12000 {
 			reg-shift = <2>;
 			interrupts = <33>;
 			clocks = <&gate_clk 7>;
+			pinctrl-0 = <&pmx_uart0>;
+			pinctrl-names = "default";
 			status = "disabled";
 		};
 
@@ -176,6 +182,8 @@ uart1: serial@12100 {
 			reg-shift = <2>;
 			interrupts = <34>;
 			clocks = <&gate_clk 7>;
+			pinctrl-0 = <&pmx_uart1>;
+			pinctrl-names = "default";
 			status = "disabled";
 		};