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

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

Put also aliases node above chosen node as same as stm32mp157c-dk2.dts.

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/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index b1eb688..2dfde62 100644 (file)
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -16,6 +16,10 @@
        model = "STMicroelectronics STM32MP157C eval daughter";
        compatible = "st,stm32mp157c-ed1", "st,stm32mp157";
 
+       aliases {
+               serial0 = &uart4;
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -72,10 +76,6 @@
                };
        };
 
-       aliases {
-               serial0 = &uart4;
-       };
-
        sd_switch: regulator-sd_switch {
                compatible = "regulator-gpio";
                regulator-name = "sd_switch";

diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index 542226c..ba8e9d9 100644 (file)
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -14,16 +14,15 @@
        model = "STMicroelectronics STM32MP157C eval daughter on eval mother";
        compatible = "st,stm32mp157c-ev1", "st,stm32mp157c-ed1", "st,stm32mp157";
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        aliases {
-               serial0 = &uart4;
                serial1 = &usart3;
                ethernet0 = &ethernet0;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        clocks {
                clk_ext_camera: clk-ext-camera {
                        #clock-cells = <0>;