linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Amit Kucheria <amit.kucheria@linaro.org>
To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	bjorn.andersson@linaro.org, edubezval@gmail.com,
	andy.gross@linaro.org, David Brown <david.brown@linaro.org>
Cc: devicetree@vger.kernel.org
Subject: [PATCH v2 12/13] arm64: dts: msm8996: thermal: Make trip names consistent
Date: Fri, 29 Mar 2019 15:42:18 +0530	[thread overview]
Message-ID: <659854a32b8a92ae564e0f2b08d962d9002a033a.1553853990.git.amit.kucheria@linaro.org> (raw)
In-Reply-To: <cover.1553853990.git.amit.kucheria@linaro.org>
In-Reply-To: <cover.1553853990.git.amit.kucheria@linaro.org>

Maintain naming consistency with what was landed for sdm845. Simplifies
parsing for test tools.

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index e2408ee91184..edcddc74a4fc 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -154,20 +154,20 @@
 	};
 
 	thermal-zones {
-		cpu-thermal0 {
+		cpu0-thermal {
 			polling-delay-passive = <250>;
 			polling-delay = <1000>;
 
 			thermal-sensors = <&tsens0 3>;
 
 			trips {
-				cpu_alert0: trip0 {
+				cpu0_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
 
-				cpu_crit0: trip1 {
+				cpu0_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
 					type = "critical";
@@ -175,20 +175,20 @@
 			};
 		};
 
-		cpu-thermal1 {
+		cpu1-thermal {
 			polling-delay-passive = <250>;
 			polling-delay = <1000>;
 
 			thermal-sensors = <&tsens0 5>;
 
 			trips {
-				cpu_alert1: trip0 {
+				cpu1_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
 
-				cpu_crit1: trip1 {
+				cpu1_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
 					type = "critical";
@@ -196,20 +196,20 @@
 			};
 		};
 
-		cpu-thermal2 {
+		cpu2-thermal {
 			polling-delay-passive = <250>;
 			polling-delay = <1000>;
 
 			thermal-sensors = <&tsens0 8>;
 
 			trips {
-				cpu_alert2: trip0 {
+				cpu2_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
 
-				cpu_crit2: trip1 {
+				cpu2_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
 					type = "critical";
@@ -217,20 +217,20 @@
 			};
 		};
 
-		cpu-thermal3 {
+		cpu3-thermal {
 			polling-delay-passive = <250>;
 			polling-delay = <1000>;
 
 			thermal-sensors = <&tsens0 10>;
 
 			trips {
-				cpu_alert3: trip0 {
+				cpu3_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
 
-				cpu_crit3: trip1 {
+				cpu3_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
 					type = "critical";
-- 
2.17.1


  parent reply	other threads:[~2019-03-29 10:13 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-29 10:12 [PATCH v2 00/13] qcom: dts: thermal cleanups Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 01/13] arm64: dts: msm8998: thermal: split address space into two Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 02/13] arm64: dts: msm8998: efficiency is not valid property Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 03/13] arm64: dts: msm8916: thermal: Add sensor for modem Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 04/13] arm64: dts: msm8996: thermal: Add temperature sensors near major peripherals Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 05/13] arm64: dts: msm8998: thermal: Fix the cpu sensor numbers Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 06/13] arm64: dts: msm8998: thermal: Fix the gpu sensor number Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 07/13] arm64: dts: msm8998: thermal: GPU has two sensors, add the second Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 08/13] arm64: dts: msm8998: thermal: Add temperature sensors near major peripherals Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 09/13] arm64: dts: sdm845: " Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 10/13] arm64: dts: msm8998: thermal: Make trip names consistent Amit Kucheria
2019-03-29 10:12 ` [PATCH v2 11/13] arm64: dts: msm8916: " Amit Kucheria
2019-03-29 10:12 ` Amit Kucheria [this message]
2019-03-29 10:12 ` [PATCH v2 13/13] arm64: dts: msm8916: thermal: Convert camera trip type to hot Amit Kucheria
2019-04-02 13:58 ` [PATCH v2 00/13] qcom: dts: thermal cleanups Marc Gonzalez
2019-04-02 18:46   ` Amit Kucheria
2019-04-23  9:31     ` Marc Gonzalez
2019-04-23 12:56       ` Amit Kucheria
2019-04-23 13:10         ` Marc Gonzalez
2019-04-24 14:30           ` Marc Gonzalez
2019-04-25  6:31             ` Amit Kucheria
2019-04-25 11:25               ` Marc Gonzalez
2019-04-25 12:02               ` Marc Gonzalez
2019-04-25 13:06               ` Marc Gonzalez
2019-04-25 13:16                 ` Amit Kucheria
2019-04-23 19:14         ` Andy Gross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=659854a32b8a92ae564e0f2b08d962d9002a033a.1553853990.git.amit.kucheria@linaro.org \
    --to=amit.kucheria@linaro.org \
    --cc=andy.gross@linaro.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=david.brown@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=edubezval@gmail.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).