diff options
-rw-r--r-- | arch/arm/boot/dts/armada-388-clearfog.dtsi | 14 | ||||
-rw-r--r-- | arch/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 @@ | |||
93 | wp-inverted; | 93 | wp-inverted; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | serial@12100 { | ||
97 | /* mikrobus uart */ | ||
98 | pinctrl-0 = <&mikro_uart_pins>; | ||
99 | pinctrl-names = "default"; | ||
100 | status = "okay"; | ||
101 | }; | ||
102 | |||
103 | usb@58000 { | 96 | usb@58000 { |
104 | /* CON3, nearest power. */ | 97 | /* CON3, nearest power. */ |
105 | status = "okay"; | 98 | status = "okay"; |
@@ -305,3 +298,10 @@ | |||
305 | pinctrl-names = "default"; | 298 | pinctrl-names = "default"; |
306 | status = "okay"; | 299 | status = "okay"; |
307 | }; | 300 | }; |
301 | |||
302 | &uart1 { | ||
303 | /* mikrobus uart */ | ||
304 | pinctrl-0 = <&mikro_uart_pins>; | ||
305 | pinctrl-names = "default"; | ||
306 | status = "okay"; | ||
307 | }; | ||
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 @@ | |||
69 | */ | 69 | */ |
70 | status = "okay"; | 70 | status = "okay"; |
71 | }; | 71 | }; |
72 | |||
73 | serial@12000 { | ||
74 | pinctrl-0 = <&uart0_pins>; | ||
75 | pinctrl-names = "default"; | ||
76 | status = "okay"; | ||
77 | }; | ||
78 | }; | 72 | }; |
79 | }; | 73 | }; |
80 | }; | 74 | }; |
@@ -144,3 +138,9 @@ | |||
144 | status = "disabled"; | 138 | status = "disabled"; |
145 | }; | 139 | }; |
146 | }; | 140 | }; |
141 | |||
142 | &uart0 { | ||
143 | pinctrl-0 = <&uart0_pins>; | ||
144 | pinctrl-names = "default"; | ||
145 | status = "okay"; | ||
146 | }; | ||