All of lore.kernel.org
 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 v1 11/12] arm64: dts: msm8916: thermal: Make trip names consistent
Date: Mon, 18 Feb 2019 18:05:25 +0530	[thread overview]
Message-ID: <cdeed815f3bbb161e51befc5e3af92ee113f31b6.1550493113.git.amit.kucheria@linaro.org> (raw)
In-Reply-To: <cover.1550493113.git.amit.kucheria@linaro.org>
In-Reply-To: <cover.1550493113.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/msm8916.dtsi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 9e4a82e5e0b4..2002f5f91a83 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -180,19 +180,19 @@
 	};
 
 	thermal-zones {
-		cpu-thermal0 {
+		cpu0_1-thermal {
 			polling-delay-passive = <250>;
 			polling-delay = <1000>;
 
 			thermal-sensors = <&tsens 5>;
 
 			trips {
-				cpu_alert0: trip0 {
+				cpu0_1_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
-				cpu_crit0: trip1 {
+				cpu0_1_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
 					type = "critical";
@@ -201,7 +201,7 @@
 
 			cooling-maps {
 				map0 {
-					trip = <&cpu_alert0>;
+					trip = <&cpu0_1_alert0>;
 					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
@@ -210,19 +210,19 @@
 			};
 		};
 
-		cpu-thermal1 {
+		cpu2_3-thermal {
 			polling-delay-passive = <250>;
 			polling-delay = <1000>;
 
 			thermal-sensors = <&tsens 4>;
 
 			trips {
-				cpu_alert1: trip0 {
+				cpu2_3_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
-				cpu_crit1: trip1 {
+				cpu2_3_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
 					type = "critical";
@@ -231,7 +231,7 @@
 
 			cooling-maps {
 				map0 {
-					trip = <&cpu_alert1>;
+					trip = <&cpu2_3_alert0>;
 					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
@@ -247,12 +247,12 @@
 			thermal-sensors = <&tsens 2>;
 
 			trips {
-				gpu_alert: trip0 {
+				gpu_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
-				gpu_crit: trip1 {
+				gpu_crit: gpu_crit {
 					temperature = <95000>;
 					hysteresis = <2000>;
 					type = "critical";
@@ -267,12 +267,12 @@
 			thermal-sensors = <&tsens 1>;
 
 			trips {
-				cam_alert: trip0 {
+				cam_alert0: trip-point@0 {
 					temperature = <75000>;
 					hysteresis = <2000>;
 					type = "passive";
 				};
-				cam_crit: trip1 {
+				cam_crit: cam_crit {
 					temperature = <95000>;
 					hysteresis = <2000>;
 					type = "critical";
-- 
2.17.1

  parent reply	other threads:[~2019-02-18 12:35 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-18 12:35 [PATCH v1 00/12] qcom: dts: thermal cleanups Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 01/12] arm64: dts: msm8998: thermal: split address space into two Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 02/12] arm64: dts: msm8998: efficiency is not valid property Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 03/12] arm64: dts: msm8916: thermal: Add sensor for modem Amit Kucheria
2019-02-20  1:24   ` Eduardo Valentin
2019-02-18 12:35 ` [PATCH v1 04/12] arm64: dts: msm8996: thermal: Add temperature sensors near major peripherals Amit Kucheria
2019-02-20  1:24   ` Eduardo Valentin
2019-02-20  9:18     ` Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 05/12] arm64: dts: msm8998: thermal: Fix the cpu sensor numbers Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 06/12] arm64: dts: msm8998: thermal: Fix the gpu sensor number Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 07/12] arm64: dts: msm8998: thermal: GPU has two sensors, add the second Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 08/12] arm64: dts: msm8998: thermal: Add temperature sensors near major peripherals Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 09/12] arm64: dts: sdm845: " Amit Kucheria
2019-02-18 12:35 ` [PATCH v1 10/12] arm64: dts: msm8998: thermal: Make trip names consistent Amit Kucheria
2019-02-18 12:35 ` Amit Kucheria [this message]
2019-02-18 12:35 ` [PATCH v1 12/12] arm64: dts: msm8996: " Amit Kucheria
2019-02-20  1:26 ` [PATCH v1 00/12] qcom: dts: thermal cleanups Eduardo Valentin
2019-02-20  9:39   ` Amit Kucheria
2019-02-20  9:39     ` Amit Kucheria
2019-02-20 23:32     ` Eduardo Valentin

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=cdeed815f3bbb161e51befc5e3af92ee113f31b6.1550493113.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.