ARM: dts: stm32mp: Repair damage from alignment with v6.3

The patch fixed by this commit renders ST STM32MP15xx EV1 board and
all DHSOM SoM based boards unbootable from SPI NOR. Fix the damage
by updating -u-boot.dtsi to match the stm32mp15-pinctrl.dtsi update.

Fixes: 08002ffd083d ("ARM: dts: stm32mp: alignment with v6.3")
Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
index 1f7fdbce53046430974711ef9a8d228c8adc01c2..eb283cacd27dce27763c1dc7e70861bad27c4d49 100644 (file)
--- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
@@ -135,20 +135,28 @@
 
 &qspi_bk1_pins_a {
        bootph-pre-ram;
-       pins1 {
+       pins {
                bootph-pre-ram;
        };
-       pins2 {
+};
+
+&qspi_cs1_pins_a {
+       bootph-pre-ram;
+       pins {
                bootph-pre-ram;
        };
 };
 
 &qspi_bk2_pins_a {
        bootph-pre-ram;
-       pins1 {
+       pins {
                bootph-pre-ram;
        };
-       pins2 {
+};
+
+&qspi_cs2_pins_a {
+       bootph-pre-ram;
+       pins {
                bootph-pre-ram;
        };
 };

diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
index f12941b05f65043da1288be119827e58caba6da1..2f70b0690d2ff36bd29b9cf1cec1890760d8b5e1 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
@@ -134,20 +134,14 @@
 
 &qspi_bk1_pins_a {
        bootph-pre-ram;
-       pins1 {
-               bootph-pre-ram;
-       };
-       pins2 {
+       pins {
                bootph-pre-ram;
        };
 };
 
-&qspi_bk2_pins_a {
+&qspi_cs1_pins_a {
        bootph-pre-ram;
-       pins1 {
-               bootph-pre-ram;
-       };
-       pins2 {
+       pins {
                bootph-pre-ram;
        };
 };

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
index eb905ad28201424b2e76781f547cfd3ce0d92a62..552b35db3c7bf00ef824a1a3d8c2205276c44b46 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
@@ -98,10 +98,14 @@
 
 &qspi_bk1_pins_a {
        bootph-pre-ram;
-       pins1 {
+       pins {
                bootph-pre-ram;
        };
-       pins2 {
+};
+
+&qspi_cs1_pins_a {
+       bootph-pre-ram;
+       pins {
                bootph-pre-ram;
        };
 };