qualcommax: ipq50xx: backport upstreamed patch for adding ipq5018 tsens node

Use upstreamed patch for adding the tsens node.

Temperature sensors are enabled by default, therefore remove explicit
enablement in board files.

Signed-off-by: George Moussalem <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19890
Signed-off-by: Robert Marko <[email protected]>

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts

@@ -528,10 +528,6 @@
 	};
 };
 
-&tsens {
-	status = "okay";
-};
-
 &pcie0_phy {
 	status = "okay";
 };

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax830.dts

@@ -385,10 +385,6 @@
 	};
 };
 
-&tsens {
-	status = "okay";
-};
-
 &q6v5_wcss {
 	status = "okay";
 

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts

@@ -312,10 +312,6 @@
 	};
 };
 
-&tsens {
-	status = "okay";
-};
-
 &q6v5_wcss {
 	status = "okay";
 

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx-base.dtsi

@@ -326,7 +326,3 @@
 		bias-disable;
 	};
 };
-
-&tsens {
-	status = "okay";
-};

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wn-dax3000gr.dts

@@ -396,10 +396,6 @@
 	};
 };
 
-&tsens {
-	status = "okay";
-};
-
 &q6v5_wcss {
 	status = "okay";
 

target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wrc-x3000gs2.dts

@@ -391,10 +391,6 @@
 	};
 };
 
-&tsens {
-	status = "okay";
-};
-
 /*
  * ath11k Wi-Fi consumes too large memory spaces and too few spaces are
  * available for users. To prevent OOM when using LuCI or other softwares,

target/linux/qualcommax/patches-6.12/0150-arm64-dts-qcom-ipq5018-Add-tsens-node.patch → target/linux/qualcommax/patches-6.12/0054-v6.18-arm64-dts-qcom-ipq5018-Add-tsens-node.patch

@@ -1,24 +1,55 @@
-From: George Moussalem <[email protected]>
-Date: Fri, 28 Feb 2025 09:11:39 +0400
-Subject: [PATCH v9 6/6] arm64: dts: qcom: ipq5018: Add tsens node
-
+From 450a80623e3b8bb5dae59e0d56046fc3d0a88f3b Mon Sep 17 00:00:00 2001
 From: Sricharan Ramabadhran <[email protected]>
+Date: Thu, 12 Jun 2025 10:46:14 +0400
+Subject: arm64: dts: qcom: ipq5018: Add tsens node
 
 IPQ5018 has tsens V1.0 IP with 5 sensors, though 4 are in use.
 There is no RPM, so tsens has to be manually enabled. Adding the tsens
-and nvmem nodes and adding 4 thermal sensors (zones). With the
-critical temperature being 120'C and action is to reboot.
+and nvmem nodes and adding 4 thermal sensors (zones). The critical trip
+temperature is set to 120'C with an action to reboot.
+
+In addition, adding a cooling device to the CPU thermal zone which uses
+CPU frequency scaling.
 
 Reviewed-by: Dmitry Baryshkov <[email protected]>
 Signed-off-by: Sricharan Ramabadhran <[email protected]>
 Signed-off-by: George Moussalem <[email protected]>
+Reviewed-by: Konrad Dybcio <[email protected]>
+[bjorn: Added tsens-v1 fallback compatible, per binding]
+Link: https://lore.kernel.org/r/[email protected]
 ---
- arch/arm64/boot/dts/qcom/ipq5018.dtsi | 169 ++++++++++++++++++++++++++
- 1 file changed, 169 insertions(+)
+ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 178 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 178 insertions(+)
+
+(limited to 'arch/arm64/boot/dts/qcom/ipq5018.dtsi')
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -182,6 +182,117 @@
+@@ -9,6 +9,7 @@
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,gcc-ipq5018.h>
+ #include <dt-bindings/reset/qcom,gcc-ipq5018.h>
++#include <dt-bindings/thermal/thermal.h>
+ 
+ / {
+ 	interrupt-parent = <&intc>;
+@@ -39,6 +40,7 @@
+ 			next-level-cache = <&l2_0>;
+ 			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
+ 			operating-points-v2 = <&cpu_opp_table>;
++			#cooling-cells = <2>;
+ 		};
+ 
+ 		cpu1: cpu@1 {
+@@ -49,6 +51,7 @@
+ 			next-level-cache = <&l2_0>;
+ 			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
+ 			operating-points-v2 = <&cpu_opp_table>;
++			#cooling-cells = <2>;
+ 		};
+ 
+ 		l2_0: l2-cache {
+@@ -182,6 +185,117 @@
  			status = "disabled";
  		};
  
@@ -95,9 +126,9 @@ Signed-off-by: George Moussalem <[email protected]>
 +		};
 +
 +		tsens: thermal-sensor@4a9000 {
-+			compatible = "qcom,ipq5018-tsens";
-+			reg = <0x004a9000 0x1000>, /* TM */
-+			      <0x004a8000 0x1000>; /* SROT */
++			compatible = "qcom,ipq5018-tsens", "qcom,tsens-v1";
++			reg = <0x004a9000 0x1000>,
++			      <0x004a8000 0x1000>;
 +
 +			nvmem-cells = <&tsens_mode>,
 +				      <&tsens_base1>,
@@ -136,63 +167,69 @@ Signed-off-by: George Moussalem <[email protected]>
  		tlmm: pinctrl@1000000 {
  			compatible = "qcom,ipq5018-tlmm";
  			reg = <0x01000000 0x300000>;
-@@ -630,6 +741,64 @@
+@@ -630,6 +744,70 @@
  			};
  		};
  	};
 +
 +	thermal-zones {
 +		cpu-thermal {
-+			polling-delay-passive = <0>;
-+			polling-delay = <0>;
 +			thermal-sensors = <&tsens 2>;
 +
 +			trips {
 +				cpu-critical {
 +					temperature = <120000>;
-+					hysteresis = <2>;
++					hysteresis = <1000>;
 +					type = "critical";
 +				};
++
++				cpu_alert: cpu-passive {
++					temperature = <100000>;
++					hysteresis = <1000>;
++					type = "passive";
++				};
++			};
++
++			cooling-maps {
++				map0 {
++					trip = <&cpu_alert>;
++					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++				};
 +			};
 +		};
 +
 +		gephy-thermal {
-+			polling-delay-passive = <0>;
-+			polling-delay = <0>;
 +			thermal-sensors = <&tsens 4>;
 +
 +			trips {
 +				gephy-critical {
 +					temperature = <120000>;
-+					hysteresis = <2>;
++					hysteresis = <1000>;
 +					type = "critical";
 +				};
 +			};
 +		};
 +
 +		top-glue-thermal {
-+			polling-delay-passive = <0>;
-+			polling-delay = <0>;
 +			thermal-sensors = <&tsens 3>;
 +
 +			trips {
-+				top_glue-critical {
++				top-glue-critical {
 +					temperature = <120000>;
-+					hysteresis = <2>;
++					hysteresis = <1000>;
 +					type = "critical";
 +				};
 +			};
 +		};
 +
 +		ubi32-thermal {
-+			polling-delay-passive = <0>;
-+			polling-delay = <0>;
 +			thermal-sensors = <&tsens 1>;
 +
 +			trips {
 +				ubi32-critical {
 +					temperature = <120000>;
-+					hysteresis = <2>;
++					hysteresis = <1000>;
 +					type = "critical";
 +				};
 +			};

target/linux/qualcommax/patches-6.12/0180-arm64-dts-qcom-ipq5018-Remove-tsens-v1-fallback-compatible.patch

@@ -0,0 +1,109 @@
+From patchwork Mon Aug 18 11:33:47 2025
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: George Moussalem <[email protected]>
+X-Patchwork-Id: 14192807
+Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org
+ [10.30.226.201])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEFC62E22A9;
+	Mon, 18 Aug 2025 11:33:51 +0000 (UTC)
+Authentication-Results: smtp.subspace.kernel.org;
+ arc=none smtp.client-ip=10.30.226.201
+ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+	t=1755516831; cv=none;
+ b=VqLETc4T2um7UBDoagDhE5FaVjJLNoLCW45q/LUrwXoemwWqIFZm7XVzEyPjuUDYlgOw9BuQEdRd7nWhXOVdv1pxkbIOt4gS7MPPVGBilyaXc/sWLyd8qk0KNcIXV1rGmEZ7Ywn0BdnngdNfSAQvSACHhpyMZpGXRodCNPE5cls=
+ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
+	s=arc-20240116; t=1755516831; c=relaxed/simple;
+	bh=ZZKBTpL6UHyciqnKATbtrkmYynWeMCWrFd/2xcp++ww=;
+	h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
+	 In-Reply-To:To:Cc;
+ b=XU6nlgSFgahhOxRhNcFU7wdAqhbLs8Ra7XxTipYaqKQqtp7v39J0ju+HaZOu9YE8a+aN4qG3R/YMTtCxZWejrgk6wU7nT/KBLqhjd1G2f0bWq/4NipYk+S7xYZyfe2lpNpZ2SRUI/1h6BFPoUnMzTeeuH8VjX/qIM3oLVe2s968=
+ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
+ dkim=pass (2048-bit key) header.d=kernel.org [email protected]
+ header.b=PKBRtdr/; arc=none smtp.client-ip=10.30.226.201
+Authentication-Results: smtp.subspace.kernel.org;
+	dkim=pass (2048-bit key) header.d=kernel.org [email protected]
+ header.b="PKBRtdr/"
+Received: by smtp.kernel.org (Postfix) with ESMTPS id 7CDF3C4CEED;
+	Mon, 18 Aug 2025 11:33:51 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
+	s=k20201202; t=1755516831;
+	bh=ZZKBTpL6UHyciqnKATbtrkmYynWeMCWrFd/2xcp++ww=;
+	h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From;
+	b=PKBRtdr/YTJTrl92zpHzzAovfqaynlZxJFZ667MTjd+V2zpPVbh/Qw2YkWFGl8Zeg
+	 JIv0gaRa7PdagA1GA06EbVEy4GO0sNTdf6FR9uMTB8QJLoShXHrFGEgBkV0GrW6GR2
+	 l8QjDRsmfKbIfV7udOOmrqR83UfsKpyVH4F39JlEvteIsWQni/6UESQxGlGkBryduS
+	 E2cVKO6sKNLJP6QVQf3TJeZsf5Xb+y/3xsqurGnhx7LD7r26jt0UaWQouihdlLn4lj
+	 AEw/X1Kg1G29aq65wiw0DT5mBXOiR0gDatBMXU/FSddyoCFlqbrMLijDrt/R6gGmcS
+	 tgOzuwrEZQhrA==
+Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org
+ (localhost.localdomain [127.0.0.1])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id 6E9D7CA0EE4;
+	Mon, 18 Aug 2025 11:33:51 +0000 (UTC)
+Date: Mon, 18 Aug 2025 15:33:47 +0400
+Subject: [PATCH 2/2] arm64: dts: qcom: ipq5018: Remove tsens v1 fallback
+ compatible
+Precedence: bulk
+X-Mailing-List: [email protected]
+List-Id: <linux-arm-msm.vger.kernel.org>
+List-Subscribe: <mailto:[email protected]>
+List-Unsubscribe: <mailto:[email protected]>
+MIME-Version: 1.0
+Message-Id: <[email protected]>
+References: <[email protected]>
+In-Reply-To: <[email protected]>
+To: Amit Kucheria <[email protected]>,
+ Thara Gopinath <[email protected]>,
+ "Rafael J. Wysocki" <[email protected]>,
+ Daniel Lezcano <[email protected]>, Zhang Rui <[email protected]>,
+ Lukasz Luba <[email protected]>, Rob Herring <[email protected]>,
+ Krzysztof Kozlowski <[email protected]>,
+ Conor Dooley <[email protected]>,
+ Sricharan Ramabadhran <[email protected]>,
+ Bjorn Andersson <[email protected]>,
+ Konrad Dybcio <[email protected]>
+Cc: [email protected], [email protected],
+ [email protected], [email protected],
+ George Moussalem <[email protected]>,
+ Dmitry Baryshkov <[email protected]>,
+ Konrad Dybcio <[email protected]>
+X-Mailer: b4 0.14.2
+X-Developer-Signature: v=1; a=ed25519-sha256; t=1755516829; l=972;
+ [email protected]; s=20250321; h=from:subject:message-id;
+ bh=HJcOgtw7oiilIyh0aWOOzNZ2iln5P6lSb3GMC6Gave0=;
+ b=uR1EVwZAX79JKZzxxM9N7TA/hO1CtlDORhZ/FGhSsA68dLhwH953wdmIPFDj4vfeWpsTsB3Bh
+ 4W66WWUho9RBMALQ66he3JtRH90AzRDuzcypOj7GRnzE6ehzDO8Gl3R
+X-Developer-Key: [email protected]; a=ed25519;
+ pk=/PuRTSI9iYiHwcc6Nrde8qF4ZDhJBlUgpHdhsIjnqIk=
+X-Endpoint-Received: by B4 Relay for [email protected]/20250321
+ with auth_id=364
+X-Original-From: George Moussalem <[email protected]>
+Reply-To: [email protected]
+From: George Moussalem <[email protected]>
+
+From: George Moussalem <[email protected]>
+
+Remove qcom,tsens-v1 as fallback compatible since this IP has no RPM
+and, as such, must use its own init routine available in the driver.
+
+Reviewed-by: Dmitry Baryshkov <[email protected]>
+Reviewed-by: Konrad Dybcio <[email protected]>
+Signed-off-by: George Moussalem <[email protected]>
+---
+ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
++++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
+@@ -340,7 +340,7 @@
+ 		};
+ 
+ 		tsens: thermal-sensor@4a9000 {
+-			compatible = "qcom,ipq5018-tsens", "qcom,tsens-v1";
++			compatible = "qcom,ipq5018-tsens";
+ 			reg = <0x004a9000 0x1000>,
+ 			      <0x004a8000 0x1000>;
+ 

target/linux/qualcommax/patches-6.12/0306-arm64-dts-qcom-ipq5018-Add-PWM-node.patch

@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -338,6 +338,16 @@
+@@ -341,6 +341,16 @@
  			reg = <0x01937000 0x21000>;
  		};
  

target/linux/qualcommax/patches-6.12/0324-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch

@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -293,6 +293,30 @@
+@@ -296,6 +296,30 @@
  			#thermal-sensor-cells = <1>;
  		};
  

target/linux/qualcommax/patches-6.12/0337-arm64-dts-qcom-ipq5018-Add-PRNG-node.patch

@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -254,6 +254,14 @@
+@@ -257,6 +257,14 @@
  			};
  		};
  
@@ -21,5 +21,5 @@ Signed-off-by: George Moussalem <[email protected]>
 +		};
 +
  		tsens: thermal-sensor@4a9000 {
- 			compatible = "qcom,ipq5018-tsens";
- 			reg = <0x004a9000 0x1000>, /* TM */
+ 			compatible = "qcom,ipq5018-tsens", "qcom,tsens-v1";
+ 			reg = <0x004a9000 0x1000>,

target/linux/qualcommax/patches-6.12/0339-arm64-dts-qcom-ipq5018-Add-QUP1-UART2-node.patch

@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -417,6 +417,16 @@
+@@ -420,6 +420,16 @@
  			status = "disabled";
  		};
  

target/linux/qualcommax/patches-6.12/0340-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch

@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -441,6 +441,21 @@
+@@ -444,6 +444,21 @@
  			status = "disabled";
  		};
  

target/linux/qualcommax/patches-6.12/0421-arm64-dts-qcom-ipq5018-Add-SPI-nand-node.patch

@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <[email protected]>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -456,6 +456,36 @@
+@@ -459,6 +459,36 @@
  			status = "disabled";
  		};
  

target/linux/qualcommax/patches-6.12/0704-arm64-dts-qcom-ipq5018-Add-ethernet-cmn-node.patch

@@ -10,7 +10,7 @@ Signed-off-by: Ziyang Huang <[email protected]>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -16,6 +16,12 @@
+@@ -17,6 +17,12 @@
  	#size-cells = <2>;
  
  	clocks {
@@ -23,7 +23,7 @@ Signed-off-by: Ziyang Huang <[email protected]>
  		sleep_clk: sleep-clk {
  			compatible = "fixed-clock";
  			#clock-cells = <0>;
-@@ -182,6 +188,17 @@
+@@ -185,6 +191,17 @@
  			status = "disabled";
  		};
  

target/linux/qualcommax/patches-6.12/0713-arm64-dts-qcom-ipq5018-add-mdio-buses.patch

@@ -22,7 +22,7 @@ Signed-off-by: George Moussalem <[email protected]>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -188,6 +188,30 @@
+@@ -191,6 +191,30 @@
  			status = "disabled";
  		};
  

target/linux/qualcommax/patches-6.12/0714-arm64-dts-qcom-ipq5018-add-ge-phy-to-internal-mdio-bus.patch

@@ -26,7 +26,7 @@ Signed-off-by: George Moussalem <[email protected]>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -22,6 +22,18 @@
+@@ -23,6 +23,18 @@
  			#clock-cells = <0>;
  		};
  
@@ -45,7 +45,7 @@ Signed-off-by: George Moussalem <[email protected]>
  		sleep_clk: sleep-clk {
  			compatible = "fixed-clock";
  			#clock-cells = <0>;
-@@ -190,7 +202,8 @@
+@@ -193,7 +205,8 @@
  
  		mdio0: mdio@88000 {
  			compatible = "qcom,ipq5018-mdio";
@@ -55,7 +55,7 @@ Signed-off-by: George Moussalem <[email protected]>
  			#address-cells = <1>;
  			#size-cells = <0>;
  
-@@ -198,6 +211,13 @@
+@@ -201,6 +214,13 @@
  			clock-names = "gcc_mdio_ahb_clk";
  
  			status = "disabled";
@@ -69,7 +69,7 @@ Signed-off-by: George Moussalem <[email protected]>
  		};
  
  		mdio1: mdio@90000 {
-@@ -392,8 +412,8 @@
+@@ -395,8 +415,8 @@
  				 <&pcie0_phy>,
  				 <&pcie1_phy>,
  				 <0>,

target/linux/qualcommax/patches-6.12/0715-arm64-dts-qcom-ipq5018-add-vendor-compatible-to-mdio-node.patch

@@ -9,7 +9,7 @@ aren't upstreamed, add the vendor compatible.
 Signed-off-by: George Moussalem <[email protected]>
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -201,7 +201,7 @@
+@@ -204,7 +204,7 @@
  		};
  
  		mdio0: mdio@88000 {

target/linux/qualcommax/patches-6.12/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch

@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -697,6 +697,225 @@
+@@ -700,6 +700,225 @@
  			};
  		};
  

target/linux/qualcommax/patches-6.12/0817-arm64-dts-qcom-ipq5018-add-tz_apps-reserved-memory-region.patch

@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -123,6 +123,11 @@
+@@ -126,6 +126,11 @@
  		#size-cells = <2>;
  		ranges;