ARM: dts: stm32: clean uart aliases on stm32mp15xx-dkx boards

Remove duplicates and clean uart aliases.
Uart aliases and uart pins should be declared and associated to
uart instance at the same time.

Signed-off-by: Valentin Caron <valentin.caron@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
index 4c8be9c8eb20e2e25695700b1acce06d0fa556de..0da3667ab1e0eea183869b98fc6b62795ee75e1e 100644 (file)
--- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
+++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
@@ -17,9 +17,6 @@
 
        aliases {
                ethernet0 = &ethernet0;
-               serial0 = &uart4;
-               serial1 = &usart3;
-               serial2 = &uart7;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/stm32mp157c-dk2.dts b/arch/arm/boot/dts/stm32mp157c-dk2.dts
index 2bc92ef3aeb9570d496f521a142326832cc379c0..ab13e340f4ef58fa837bf6b4971dee2ca0b8e157 100644 (file)
--- a/arch/arm/boot/dts/stm32mp157c-dk2.dts
+++ b/arch/arm/boot/dts/stm32mp157c-dk2.dts
@@ -18,9 +18,6 @@
 
        aliases {
                ethernet0 = &ethernet0;
-               serial0 = &uart4;
-               serial1 = &usart3;
-               serial2 = &uart7;
                serial3 = &usart2;
        };
 

diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
index 11370ae0d868b71759946fb2151c8fac65d9287e..ded5ab9a4798647a85eaec7c66201227e37a4b91 100644 (file)
--- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
@@ -8,6 +8,12 @@
 #include <dt-bindings/mfd/st,stpmic1.h>
 
 / {
+       aliases {
+               serial0 = &uart4;
+               serial1 = &usart3;
+               serial2 = &uart7;
+       };
+
        memory@c0000000 {
                device_type = "memory";
                reg = <0xc0000000 0x20000000>;