ARM: dts: armada388-clearfog: move uart nodes

Move the uart nodes over to use the label form to reference the serial
devices, rather than replicating the device node path.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi
index 6149699eefc2a227fff90c5d9c9768e950509150..0f5938bede53c30ce84f24a9a9b733517cc52118 100644 (file)
--- a/arch/arm/boot/dts/armada-388-clearfog.dtsi
+++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi
@@ -93,13 +93,6 @@
                                wp-inverted;
                        };
 
-                       serial@12100 {
-                               /* mikrobus uart */
-                               pinctrl-0 = <&mikro_uart_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-                       };
-
                        usb@58000 {
                                /* CON3, nearest  power. */
                                status = "okay";
@@ -305,3 +298,10 @@
        pinctrl-names = "default";
        status = "okay";
 };
+
+&uart1 {
+       /* mikrobus uart */
+       pinctrl-0 = <&mikro_uart_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
index 213b1fb11e7c84429b475084d634030873e83793..9b508a8161f53f12344196619b42b26c49fdbe9b 100644 (file)
--- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
@@ -69,12 +69,6 @@
                                 */
                                status = "okay";
                        };
-
-                       serial@12000 {
-                               pinctrl-0 = <&uart0_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-                       };
                };
        };
 };
@@ -144,3 +138,9 @@
                status = "disabled";
        };
 };
+
+&uart0 {
+       pinctrl-0 = <&uart0_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};