| Message ID | 20241105233026.161463-1-marex@denx.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: dts: stm32: Deduplicate serial aliases and chosen node for STM32MP15xx DHCOM SoM | expand |
> From: Marek Vasut <marex@denx.de> > Sent: Wednesday, November 6, 2024 12:30 AM > 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> > --- > Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> > Cc: Conor Dooley <conor+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzk+dt@kernel.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Rob Herring <robh@kernel.org> > Cc: devicetree@vger.kernel.org > Cc: kernel@dh-electronics.com > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-stm32@st-md-mailman.stormreply.com > --- > arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi | 12 ------------ > arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi | 10 ---------- > arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi | 10 ---------- > arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 7 +++++++ > 4 files changed, 7 insertions(+), 32 deletions(-) > > diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi > b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi > index bb4f8a0b937f3..abe2dfe706364 100644 > --- 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 171d7c7658fa8..0fb4e55843b9d 100644 > --- 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 b5bc53accd6b2..01c693cc03446 100644 > --- 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 74a11ccc5333f..086d3a60ccce2 100644 > --- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi > +++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi > @@ -14,6 +14,13 @@ aliases { > ethernet1 = &ksz8851; > rtc0 = &hwrtc; > rtc1 = &rtc; > + serial0 = &uart4; > + serial1 = &usart3; > + serial2 = &uart8; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > }; > > memory@c0000000 { Reviewed-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi index bb4f8a0b937f3..abe2dfe706364 100644 --- 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 171d7c7658fa8..0fb4e55843b9d 100644 --- 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 b5bc53accd6b2..01c693cc03446 100644 --- 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 74a11ccc5333f..086d3a60ccce2 100644 --- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi @@ -14,6 +14,13 @@ aliases { ethernet1 = &ksz8851; rtc0 = &hwrtc; rtc1 = &rtc; + serial0 = &uart4; + serial1 = &usart3; + serial2 = &uart8; + }; + + chosen { + stdout-path = "serial0:115200n8"; }; memory@c0000000 {
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> --- Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> Cc: Conor Dooley <conor+dt@kernel.org> Cc: Krzysztof Kozlowski <krzk+dt@kernel.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Rob Herring <robh@kernel.org> Cc: devicetree@vger.kernel.org Cc: kernel@dh-electronics.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com --- arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi | 12 ------------ arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi | 10 ---------- arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi | 10 ---------- arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 7 +++++++ 4 files changed, 7 insertions(+), 32 deletions(-)