[PATCH] 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 --- NOTE: It is truly incomprehensible how 08002ffd083d was ever tested at ST, I can only speculate it never was tested at all, grumb. --- Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com --- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 16 ++++++++++++---- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 12 +++--------- arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 8 ++++++-- 3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi index 1f7fdbce530..eb283cacd27 100644 --- 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 f12941b05f6..2f70b0690d2 100644 --- 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 eb905ad2820..552b35db3c7 100644 --- 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; }; };
On 10/10/23 01:15, Marek Vasut wrote:
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
NOTE: It is truly incomprehensible how 08002ffd083d was ever tested at ST, I can only speculate it never was tested at all, grumb.
Hi Marek,
Sorry for that, you are right, SPI NOR boot in SPL is no more tested on our side :-( Today we are only tested boot from sdcard with tf-a/optee.
Thanks for you fix.
Patrice
Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 16 ++++++++++++---- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 12 +++--------- arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 8 ++++++-- 3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi index 1f7fdbce530..eb283cacd27 100644 --- 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 f12941b05f6..2f70b0690d2 100644 --- 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 eb905ad2820..552b35db3c7 100644 --- 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; };
};
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com
Patrice
On 10/10/23 15:04, Patrice CHOTARD wrote:
On 10/10/23 01:15, Marek Vasut wrote:
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
NOTE: It is truly incomprehensible how 08002ffd083d was ever tested at ST, I can only speculate it never was tested at all, grumb.
Hi Marek,
Sorry for that, you are right, SPI NOR boot in SPL is no more tested on our side :-( Today we are only tested boot from sdcard with tf-a/optee.
Thanks for you fix.
Patrice
Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 16 ++++++++++++---- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 12 +++--------- arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 8 ++++++-- 3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi index 1f7fdbce530..eb283cacd27 100644 --- 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 f12941b05f6..2f70b0690d2 100644 --- 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 eb905ad2820..552b35db3c7 100644 --- 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; };
};
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com
Patrice
Applied to u-boot-stm32/master
Thanks Patrice
participants (2)
-
Marek Vasut -
Patrice CHOTARD