ARM: dts: stm32: Deduplicate serial aliases and chosen node for STM32MP15xx DHCOM SoM

Deduplicate /aliases { serialN = ... } and /chosen node into
stm32mp15xx-dhcom-som.dtsi , since the content is identical
on all carrier boards using the STM32MP15xx DHCOM SoM. No
functional change.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi
index bb4f8a0b937f37f6b3fc50d3bbe58c786030852c..abe2dfe706364b1ddb8f20fc586877f85f17027b 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi
@@ -6,18 +6,6 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/pwm/pwm.h>
 
-/ {
-       aliases {
-               serial0 = &uart4;
-               serial1 = &usart3;
-               serial2 = &uart8;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-};
-
 &adc {
        status = "disabled";
 };

diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi
index 171d7c7658fa86afbd73d36d28e08118041dce72..0fb4e55843b9d25f5c3b05a0379eca59c50930b6 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi
@@ -7,16 +7,6 @@
 #include <dt-bindings/pwm/pwm.h>
 
 / {
-       aliases {
-               serial0 = &uart4;
-               serial1 = &usart3;
-               serial2 = &uart8;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        clk_ext_audio_codec: clock-codec {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi
index b5bc53accd6b2f54ca99d8188dfe33d77adec092..01c693cc03446c6e9ccce71f50fb3ef8b8ef6353 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi
@@ -7,16 +7,6 @@
 #include <dt-bindings/pwm/pwm.h>
 
 / {
-       aliases {
-               serial0 = &uart4;
-               serial1 = &usart3;
-               serial2 = &uart8;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        led {
                compatible = "gpio-leds";
 

diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi
index 74a11ccc5333f849acf4ddc8e77f07b1a0f933f3..086d3a60ccce2d2320addae81fba744c6983eb61 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi
@@ -14,6 +14,13 @@
                ethernet1 = &ksz8851;
                rtc0 = &hwrtc;
                rtc1 = &rtc;
+               serial0 = &uart4;
+               serial1 = &usart3;
+               serial2 = &uart8;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
        };
 
        memory@c0000000 {