From ed51e7902c51ceda11f6f64dde1f9ae6fc131368 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 2 Jan 2017 15:27:32 +0000 Subject: [PATCH] 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 Signed-off-by: Gregory CLEMENT --- arch/arm/boot/dts/armada-388-clearfog.dtsi | 14 +++++++------- .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi index 6149699eefc2..0f5938bede53 100644 --- 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 213b1fb11e7c..9b508a8161f5 100644 --- 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"; +}; -- 2.20.1