summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/patches
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2022-07-25 14:04:39 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2022-09-05 15:50:02 +0200
commit4b168591273d84e961570fbc70d13b60eb909d02 (patch)
tree424dbf619f8f8c3d7e31d07b86babff247b220f3 /configs/platform-v7a/patches
parent3e0983f4b7c82ed2bdf034b311c100fdb5897dde (diff)
downloadDistroKit-4b168591273d84e961570fbc70d13b60eb909d02.tar.gz
DistroKit-4b168591273d84e961570fbc70d13b60eb909d02.tar.xz
v7a: tf-a: update to v2.7
We need at least v2.6 for FIP support, but there's a freshly released v2.7, so lets use that. This unfortunately means we need to carry a patch for the MC-1 because upstream broke it. To ensure the legacy image works for now, we need to set a new build option, but that will be removed soon enough with the switch to FIP. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.pengutronix.de/20220725120445.1295669-2-a.fatoum@pengutronix.de Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a/patches')
-rw-r--r--configs/platform-v7a/patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch105
-rw-r--r--configs/platform-v7a/patches/tf-a-v2.7/series1
2 files changed, 106 insertions, 0 deletions
diff --git a/configs/platform-v7a/patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch b/configs/platform-v7a/patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch
new file mode 100644
index 0000000..4377783
--- /dev/null
+++ b/configs/platform-v7a/patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch
@@ -0,0 +1,105 @@
+From 9746daccb7611411a38169f20413ea8445310431 Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Thu, 2 Jun 2022 06:28:31 +0200
+Subject: [PATCH] fix(stm32mp1): fdts: stm32mp1: align DDR regulators with new
+ driver
+
+With recent changes, TF-A now panics on LXA MC1, Avernger96 and Odyssey:
+
+ NOTICE: CPU: STM32MP157C?? Rev.B
+ NOTICE: Model: Linux Automation MC-1 board
+ ERROR: regul ldo3: max value 750 is invalid
+ PANIC at PC : 0x2ffeebb7
+
+as the driver takes great offense at the content of the device
+tree. The parts in question were copy-pasted from ST DTs, but those
+ST DTs were fixed by commit 67d95409baae
+("refactor(stm32mp1-fdts): update regulator description").
+
+Fix the breakage by transplanting the same changes into all STM32MP1 DTs.
+
+Fixes: bba9fdee589f ("feat(stm32mp1): add regulator framework compilation")
+Change-Id: I143d0091625f62c313b3b71449c9ad99583d01c8
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Origin: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/15370
+---
+ fdts/stm32mp157a-avenger96.dts | 4 +---
+ fdts/stm32mp157c-odyssey-som.dtsi | 4 +---
+ fdts/stm32mp15xx-osd32.dtsi | 4 +---
+ 3 files changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/fdts/stm32mp157a-avenger96.dts b/fdts/stm32mp157a-avenger96.dts
+index b967736e4786..6ae97c7581d1 100644
+--- a/fdts/stm32mp157a-avenger96.dts
++++ b/fdts/stm32mp157a-avenger96.dts
+@@ -115,10 +115,9 @@
+
+ vtt_ddr: ldo3 {
+ regulator-name = "vtt_ddr";
+- regulator-min-microvolt = <500000>;
+- regulator-max-microvolt = <750000>;
+ regulator-always-on;
+ regulator-over-current-protection;
++ st,regulator-sink-source;
+ };
+
+ vdd_usb: ldo4 {
+@@ -143,7 +142,6 @@
+ vref_ddr: vref_ddr {
+ regulator-name = "vref_ddr";
+ regulator-always-on;
+- regulator-over-current-protection;
+ };
+
+ bst_out: boost {
+diff --git a/fdts/stm32mp157c-odyssey-som.dtsi b/fdts/stm32mp157c-odyssey-som.dtsi
+index 6bed33968f73..c4e13985a3f7 100644
+--- a/fdts/stm32mp157c-odyssey-som.dtsi
++++ b/fdts/stm32mp157c-odyssey-som.dtsi
+@@ -140,10 +140,9 @@
+
+ vtt_ddr: ldo3 {
+ regulator-name = "vtt_ddr";
+- regulator-min-microvolt = <500000>;
+- regulator-max-microvolt = <750000>;
+ regulator-always-on;
+ regulator-over-current-protection;
++ st,regulator-sink-source;
+ };
+
+ vdd_usb: ldo4 {
+@@ -170,7 +169,6 @@
+ vref_ddr: vref_ddr {
+ regulator-name = "vref_ddr";
+ regulator-always-on;
+- regulator-over-current-protection;
+ };
+
+ bst_out: boost {
+diff --git a/fdts/stm32mp15xx-osd32.dtsi b/fdts/stm32mp15xx-osd32.dtsi
+index 76a25613a14d..ca672356293c 100644
+--- a/fdts/stm32mp15xx-osd32.dtsi
++++ b/fdts/stm32mp15xx-osd32.dtsi
+@@ -81,10 +81,9 @@
+
+ vtt_ddr: ldo3 {
+ regulator-name = "vtt_ddr";
+- regulator-min-microvolt = <500000>;
+- regulator-max-microvolt = <750000>;
+ regulator-always-on;
+ regulator-over-current-protection;
++ st,regulator-sink-source;
+ };
+
+ vdd_usb: ldo4 {
+@@ -110,7 +109,6 @@
+ vref_ddr: vref_ddr {
+ regulator-name = "vref_ddr";
+ regulator-always-on;
+- regulator-over-current-protection;
+ };
+
+ bst_out: boost {
+--
+2.30.2
+
diff --git a/configs/platform-v7a/patches/tf-a-v2.7/series b/configs/platform-v7a/patches/tf-a-v2.7/series
new file mode 100644
index 0000000..79c39b0
--- /dev/null
+++ b/configs/platform-v7a/patches/tf-a-v2.7/series
@@ -0,0 +1 @@
+0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch