ARM/arm64: dts: st: fix node ordering in ST board device trees
Subsystems (2)
v2 cover ARM/arm64: dts: st: fix node ordering in ST board device trees
In the ST board DTS files, &label entries must be ordered alphanumerically.
Over time, several nodes ended up out of order as a side effect of adding new features or refactoring existing ones.
This series restores the correct alphanumeric ordering across all ST board DTS files, with no functional change.
---
Changes in v2:
- Fix typo in commit message of patch 1.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Amelie Delaunay (5):
arm64: dts: st: reorder ommanager node in stm32mp257f-ev1.dts
ARM: dts: stm32: reorder cs_cti_trace node in stm32mp135f-dk.dts
ARM: dts: stm32: reorder cs_cti_trace node in stm32mp15xx-dkx.dtsi
ARM: dts: stm32: reorder cs_cti_trace node in stm32mp157c-ev1.dts
ARM: dts: stm32: reorder mdma1 node in stm32mp15*-scmi.dts
arch/arm/boot/dts/st/stm32mp135f-dk.dts | 4 +- arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 6 +-- arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 6 +-- arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 56 +++++++++++++-------------- 8 files changed, 52 insertions(+), 52 deletions(-)
---
base-commit: fba4a31a7f3b6b29b01c83180f83e7ed4c398738
change-id: 20260611-node_reordering-4b9b132b007f
Best regards,
Signature · 1 line
Amelie Delaunay <[email protected]>
PATCH v2 1/5 arm64: dts: st: reorder ommanager node in stm32mp257f-ev1.dts
In the ST board DTS files, the &label entries must be ordered alphanumerically.
The nodes became misordered when &ommanager and &lptimer3 were added simultaneously. After that, <dc and &lvds used the &lptimers position as a reference.
Move ommanager at the right place to avoid future misordering.
--- arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 56 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-)
arch/arm64/boot/dts/st/stm32mp257f-ev1.dts +28 -28
@@ -307,34 +307,6 @@ &i2c8 { /delete-property/dma-names; }; -&ommanager { - memory-region = <&mm_ospi1>; - memory-region-names = "ospi1"; - pinctrl-0 = <&ospi_port1_clk_pins_a - &ospi_port1_io03_pins_a - &ospi_port1_cs0_pins_a>; - pinctrl-1 = <&ospi_port1_clk_sleep_pins_a - &ospi_port1_io03_sleep_pins_a - &ospi_port1_cs0_sleep_pins_a>; - pinctrl-names = "default", "sleep"; - status = "okay"; - - spi@0 { - #address-cells = <1>; - #size-cells = <0>; - memory-region = <&mm_ospi1>; - status = "okay"; - - flash0: flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <4>; - spi-max-frequency = <50000000>; - }; - }; -}; - /* use LPTIMER with tick broadcast for suspend mode */ &lptimer3 { status = "okay";
@@ -374,6 +346,34 @@ lvds_out0: endpoint { }; }; +&ommanager { + memory-region = <&mm_ospi1>; + memory-region-names = "ospi1"; + pinctrl-0 = <&ospi_port1_clk_pins_a + &ospi_port1_io03_pins_a + &ospi_port1_cs0_pins_a>; + pinctrl-1 = <&ospi_port1_clk_sleep_pins_a + &ospi_port1_io03_sleep_pins_a + &ospi_port1_cs0_sleep_pins_a>; + pinctrl-names = "default", "sleep"; + status = "okay"; + + spi@0 { + #address-cells = <1>; + #size-cells = <0>; + memory-region = <&mm_ospi1>; + status = "okay"; + + flash0: flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; + spi-max-frequency = <50000000>; + }; + }; +}; + &pcie_ep { pinctrl-names = "default", "init"; pinctrl-0 = <&pcie_pins_a>;
Signature · 1 line
2.43.0
PATCH v2 2/5 ARM: dts: stm32: reorder cs_cti_trace node in stm32mp135f-dk.dts
In reply to Amelie DelaunayIn the ST board DTS files, the &label entries must be ordered alphanumerically.
The nodes became misordered when Coresight support was added.
Move cs_cti_trace to the right place to avoid future misordering.
--- arch/arm/boot/dts/st/stm32mp135f-dk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/st/stm32mp135f-dk.dts +2 -2
@@ -190,11 +190,11 @@ &cryp { status = "okay"; }; -&cs_cti_trace { +&cs_cti_cpu0 { status = "okay"; }; -&cs_cti_cpu0 { +&cs_cti_trace { status = "okay"; };
Signature · 1 line
2.43.0
PATCH v2 3/5 ARM: dts: stm32: reorder cs_cti_trace node in stm32mp15xx-dkx.dtsi
In reply to Amelie DelaunayIn the ST board DTS files, the &label entries must be ordered alphanumerically.
The nodes became misordered when Coresight support was added.
Move cs_cti_trace to the right place to avoid future misordering.
--- arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi +3 -3
@@ -155,15 +155,15 @@ &crc1 { status = "okay"; }; -&cs_cti_trace { +&cs_cti_cpu0 { status = "okay"; }; -&cs_cti_cpu0 { +&cs_cti_cpu1 { status = "okay"; }; -&cs_cti_cpu1 { +&cs_cti_trace { status = "okay"; };
Signature · 1 line
2.43.0
PATCH v2 4/5 ARM: dts: stm32: reorder cs_cti_trace node in stm32mp157c-ev1.dts
In reply to Amelie DelaunayIn the ST board DTS files, the &label entries must be ordered alphanumerically.
The nodes became misordered when Coresight support was added.
Move cs_cti_trace to the right place to avoid future misordering.
--- arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/st/stm32mp157c-ev1.dts +3 -3
@@ -81,15 +81,15 @@ &cec { status = "okay"; }; -&cs_cti_trace { +&cs_cti_cpu0 { status = "okay"; }; -&cs_cti_cpu0 { +&cs_cti_cpu1 { status = "okay"; }; -&cs_cti_cpu1 { +&cs_cti_trace { status = "okay"; };
Signature · 1 line
2.43.0
PATCH v2 5/5 ARM: dts: stm32: reorder mdma1 node in stm32mp15*-scmi.dts
In reply to Amelie DelaunayIn the ST board DTS files, the &label entries must be ordered alphanumerically.
The nodes became misordered when mlahb was replaced by m4_rproc.
Move mdma1 to the right place to avoid future misordering.
--- arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 8 ++++---- arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 8 ++++---- arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 8 ++++---- arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts +4 -4
@@ -51,10 +51,6 @@ &iwdg2 { clocks = <&rcc IWDG2>, <&scmi_clk CK_SCMI_LSI>; }; -&mdma1 { - resets = <&scmi_reset RST_SCMI_MDMA>; -}; - &m4_rproc { /delete-property/ st,syscfg-holdboot; resets = <&scmi_reset RST_SCMI_MCU>,
@@ -62,6 +58,10 @@ &m4_rproc { reset-names = "mcu_rst", "hold_boot"; }; +&mdma1 { + resets = <&scmi_reset RST_SCMI_MDMA>; +}; + &optee { interrupt-parent = <&intc>; interrupts = <GIC_PPI 15 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts +4 -4
@@ -57,10 +57,6 @@ &iwdg2 { clocks = <&rcc IWDG2>, <&scmi_clk CK_SCMI_LSI>; }; -&mdma1 { - resets = <&scmi_reset RST_SCMI_MDMA>; -}; - &m4_rproc { /delete-property/ st,syscfg-holdboot; resets = <&scmi_reset RST_SCMI_MCU>,
@@ -68,6 +64,10 @@ &m4_rproc { reset-names = "mcu_rst", "hold_boot"; }; +&mdma1 { + resets = <&scmi_reset RST_SCMI_MDMA>; +}; + &optee { interrupt-parent = <&intc>; interrupts = <GIC_PPI 15 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts +4 -4
@@ -56,10 +56,6 @@ &iwdg2 { clocks = <&rcc IWDG2>, <&scmi_clk CK_SCMI_LSI>; }; -&mdma1 { - resets = <&scmi_reset RST_SCMI_MDMA>; -}; - &m4_rproc { /delete-property/ st,syscfg-holdboot; resets = <&scmi_reset RST_SCMI_MCU>,
@@ -67,6 +63,10 @@ &m4_rproc { reset-names = "mcu_rst", "hold_boot"; }; +&mdma1 { + resets = <&scmi_reset RST_SCMI_MDMA>; +}; + &optee { interrupt-parent = <&intc>; interrupts = <GIC_PPI 15 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts +4 -4
@@ -61,10 +61,6 @@ &m_can1 { clocks = <&scmi_clk CK_SCMI_HSE>, <&rcc FDCAN_K>; }; -&mdma1 { - resets = <&scmi_reset RST_SCMI_MDMA>; -}; - &m4_rproc { /delete-property/ st,syscfg-holdboot; resets = <&scmi_reset RST_SCMI_MCU>,
@@ -72,6 +68,10 @@ &m4_rproc { reset-names = "mcu_rst", "hold_boot"; }; +&mdma1 { + resets = <&scmi_reset RST_SCMI_MDMA>; +}; + &optee { interrupt-parent = <&intc>; interrupts = <GIC_PPI 15 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
Signature · 1 line
2.43.0
Alexandre TORGUE
maintainerHi Amélie
Quoted 30 lines · Amelie Delaunay
In the ST board DTS files, &label entries must be ordered alphanumerically.
Over time, several nodes ended up out of order as a side effect of adding new features or refactoring existing ones.
This series restores the correct alphanumeric ordering across all ST board DTS files, with no functional change.Signed-off-by Amelie Delaunay <[email protected]>---
Changes in v2:
- Fix typo in commit message of patch 1.
- Link to v1: https://lore.kernel.org/r/[email protected]---
Amelie Delaunay (5):
arm64: dts: st: reorder ommanager node instm32mp257f-ev1.dts
ARM: dts: stm32: reordercs_cti_tracenode instm32mp135f-dk.dts
ARM: dts: stm32: reordercs_cti_tracenode instm32mp15xx-dkx.dtsi
ARM: dts: stm32: reordercs_cti_tracenode instm32mp157c-ev1.dts
ARM: dts: stm32: reorder mdma1 node in stm32mp15*-scmi.dtsarch/arm/boot/dts/st/stm32mp135f-dk.dts | 4 +- arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 8 ++-- arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 6 +-- arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 6 +-- arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 56 +++++++++++++-------------- 8 files changed, 52 insertions(+), 52 deletions(-)
Quoted 5 lines
---
base-commit:fba4a31a7f3b6b29b01c83180f83e7ed4c398738
change-id: 20260611-node_reordering-4b9b132b007fBest regards,
Series applied on stm32-next.
Regards
Alex