qualcommax: ipq807x: use upstreamed thermal trips patch

Critical thermal trips patch got merged upstream, so use the upstreamed
patch and mark it as backport along with the future 6.5 kernel version.

Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/patches-6.1/0023-v6.5-arm64-dts-qcom-ipq8074-add-critical-thermal-trips.patch b/target/linux/qualcommax/patches-6.1/0023-v6.5-arm64-dts-qcom-ipq8074-add-critical-thermal-trips.patch
new file mode 100644 (file)
index 0000000..e720eb2
--- /dev/null
+++ b/target/linux/qualcommax/patches-6.1/0023-v6.5-arm64-dts-qcom-ipq8074-add-critical-thermal-trips.patch
@@ -0,0 +1,199 @@
+From 56d3067cb694ba60d654e7f5ef231b6fabc4697f Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Wed, 7 Jun 2023 20:44:48 +0200
+Subject: [PATCH] arm64: dts: qcom: ipq8074: add critical thermal trips
+
+According to bindings, thermal zones must have associated trips as well.
+Since we currently dont have CPUFreq support and thus no passive cooling
+lets start by defining critical trips to protect the devices against
+severe overheating.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Link: https://lore.kernel.org/r/20230607184448.2512179-1-robimarko@gmail.com
+---
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 96 +++++++++++++++++++++++++++
+ 1 file changed, 96 insertions(+)
+
+--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
++++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+@@ -896,6 +896,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 4>;
++
++                      trips {
++                              nss-top-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               nss0-thermal {
+@@ -903,6 +911,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 5>;
++
++                      trips {
++                              nss-0-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               nss1-thermal {
+@@ -910,6 +926,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 6>;
++
++                      trips {
++                              nss-1-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               wcss-phya0-thermal {
+@@ -917,6 +941,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 7>;
++
++                      trips {
++                              wcss-phya0-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               wcss-phya1-thermal {
+@@ -924,6 +956,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 8>;
++
++                      trips {
++                              wcss-phya1-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               cpu0_thermal: cpu0-thermal {
+@@ -931,6 +971,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 9>;
++
++                      trips {
++                              cpu0-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               cpu1_thermal: cpu1-thermal {
+@@ -938,6 +986,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 10>;
++
++                      trips {
++                              cpu1-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               cpu2_thermal: cpu2-thermal {
+@@ -945,6 +1001,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 11>;
++
++                      trips {
++                              cpu2-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               cpu3_thermal: cpu3-thermal {
+@@ -952,6 +1016,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 12>;
++
++                      trips {
++                              cpu3-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               cluster_thermal: cluster-thermal {
+@@ -959,6 +1031,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 13>;
++
++                      trips {
++                              cluster-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               wcss-phyb0-thermal {
+@@ -966,6 +1046,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 14>;
++
++                      trips {
++                              wcss-phyb0-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+ 
+               wcss-phyb1-thermal {
+@@ -973,6 +1061,14 @@
+                       polling-delay = <1000>;
+ 
+                       thermal-sensors = <&tsens 15>;
++
++                      trips {
++                              wcss-phyb1-crit {
++                                      temperature = <110000>;
++                                      hysteresis = <1000>;
++                                      type = "critical";
++                              };
++                      };
+               };
+       };
+ };

diff --git a/target/linux/qualcommax/patches-6.1/0134-arm64-dts-qcom-ipq8074-add-critical-thermal-trips.patch b/target/linux/qualcommax/patches-6.1/0134-arm64-dts-qcom-ipq8074-add-critical-thermal-trips.patch
deleted file mode 100644 (file)
index 6231d8a..0000000
--- a/target/linux/qualcommax/patches-6.1/0134-arm64-dts-qcom-ipq8074-add-critical-thermal-trips.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 145bbf2b88990ef3ff00ee541bb7662008683c16 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Wed, 7 Jun 2023 20:26:26 +0200
-Subject: [PATCH] arm64: dts: qcom: ipq8074: add critical thermal trips
-
-According to bindings, thermal zones must have associated trips as well.
-Since we currently dont have CPUFreq support and thus no passive cooling
-lets start by defining critical trips to protect the devices against
-severe overheating.
-
-Signed-off-by: Robert Marko <robimarko@gmail.com>
----
- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 96 +++++++++++++++++++++++++++
- 1 file changed, 96 insertions(+)
-
---- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -1293,6 +1293,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 4>;
-+
-+                      trips {
-+                              nss-top-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               nss0-thermal {
-@@ -1300,6 +1308,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 5>;
-+
-+                      trips {
-+                              nss-0-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               nss1-thermal {
-@@ -1307,6 +1323,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 6>;
-+
-+                      trips {
-+                              nss-1-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               wcss-phya0-thermal {
-@@ -1314,6 +1338,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 7>;
-+
-+                      trips {
-+                              wcss-phya0-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               wcss-phya1-thermal {
-@@ -1321,6 +1353,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 8>;
-+
-+                      trips {
-+                              wcss-phya1-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               cpu0_thermal: cpu0-thermal {
-@@ -1328,6 +1368,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 9>;
-+
-+                      trips {
-+                              cpu0-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               cpu1_thermal: cpu1-thermal {
-@@ -1335,6 +1383,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 10>;
-+
-+                      trips {
-+                              cpu1-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               cpu2_thermal: cpu2-thermal {
-@@ -1342,6 +1398,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 11>;
-+
-+                      trips {
-+                              cpu2-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               cpu3_thermal: cpu3-thermal {
-@@ -1349,6 +1413,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 12>;
-+
-+                      trips {
-+                              cpu3-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               cluster_thermal: cluster-thermal {
-@@ -1356,6 +1428,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 13>;
-+
-+                      trips {
-+                              cluster-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               wcss-phyb0-thermal {
-@@ -1363,6 +1443,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 14>;
-+
-+                      trips {
-+                              wcss-phyb0-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
- 
-               wcss-phyb1-thermal {
-@@ -1370,6 +1458,14 @@
-                       polling-delay = <1000>;
- 
-                       thermal-sensors = <&tsens 15>;
-+
-+                      trips {
-+                              wcss-phyb1-crit {
-+                                      temperature = <110000>;
-+                                      hysteresis = <1000>;
-+                                      type = "critical";
-+                              };
-+                      };
-               };
-       };
- };