linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/5] dts patches for qcom tsens support
@ 2016-08-10  6:43 Rajendra Nayak
  2016-08-10  6:43 ` [PATCH v2 1/5] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes Rajendra Nayak
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Rajendra Nayak @ 2016-08-10  6:43 UTC (permalink / raw)
  To: andy.gross; +Cc: linux-arm-msm, devicetree, linux-kernel, Rajendra Nayak

Hey Andy,

Tsens driver patches are pulled in by Eduardo [1]
but looks like they missed the 4.8 merge window.
Nevertheless, these are dts changes for the various platforms
supported by the driver, which are acked by Eduardo.
Can you please pull these in for 4.9? (I am hoping the driver
would be merged in in 4.9 as well)

Changes from v1:
- Fixed the warings seen when compiled with W=1 as suggested by Rob

[1] https://www.spinics.net/lists/arm-kernel/msg515721.html

Rajendra Nayak (5):
  arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes
  arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
  arm: dts: apq8084: Add thermal zones, tsens and qfprom nodes
  arm64: dts: msm8916: Add thermal zones, tsens and qfprom nodes
  arm64: dts: msm8996: Add thermal zones, tsens and qfprom nodes

 .../devicetree/bindings/clock/qcom,gcc.txt         |  18 ++++
 arch/arm/boot/dts/qcom-apq8064.dtsi                | 103 +++++++++++++++++++++
 arch/arm/boot/dts/qcom-apq8084.dtsi                | 103 +++++++++++++++++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi                | 103 +++++++++++++++++++++
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |  64 +++++++++++++
 arch/arm64/boot/dts/qcom/msm8996.dtsi              |  92 ++++++++++++++++++
 6 files changed, 483 insertions(+)

-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v2 1/5] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes
  2016-08-10  6:43 [PATCH v2 0/5] dts patches for qcom tsens support Rajendra Nayak
@ 2016-08-10  6:43 ` Rajendra Nayak
  2016-08-10  6:43 ` [PATCH v2 2/5] arm: dts: apq8064: " Rajendra Nayak
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Rajendra Nayak @ 2016-08-10  6:43 UTC (permalink / raw)
  To: andy.gross; +Cc: linux-arm-msm, devicetree, linux-kernel, Rajendra Nayak

Add thermal zones, tsens and qfprom nodes

Acked-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 103 ++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 561d4d1..255c61a 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -131,6 +131,88 @@
 		};
 	};
 
+	thermal-zones {
+		cpu-thermal0 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 5>;
+
+			trips {
+				cpu_alert0: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit0: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal1 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 6>;
+
+			trips {
+				cpu_alert1: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit1: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal2 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 7>;
+
+			trips {
+				cpu_alert2: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit2: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal3 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 8>;
+
+			trips {
+				cpu_alert3: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit3: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	cpu-pmu {
 		compatible = "qcom,krait-pmu";
 		interrupts = <1 7 0xf04>;
@@ -287,6 +369,27 @@
 			reg = <0xf9011000 0x1000>;
 		};
 
+		qfprom: qfprom@fc4bc000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "qcom,qfprom";
+			reg = <0xfc4bc000 0x1000>;
+			tsens_calib: calib@d0 {
+				reg = <0xd0 0x18>;
+			};
+			tsens_backup: backup@440 {
+				reg = <0x440 0x10>;
+			};
+		};
+
+		tsens: thermal-sensor@fc4a8000 {
+			compatible = "qcom,msm8974-tsens";
+			reg = <0xfc4a8000 0x2000>;
+			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+			nvmem-cell-names = "calib", "calib_backup";
+			#thermal-sensor-cells = <1>;
+		};
+
 		timer@f9020000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v2 2/5] arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
  2016-08-10  6:43 [PATCH v2 0/5] dts patches for qcom tsens support Rajendra Nayak
  2016-08-10  6:43 ` [PATCH v2 1/5] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes Rajendra Nayak
@ 2016-08-10  6:43 ` Rajendra Nayak
  2016-08-12 18:13   ` Rob Herring
  2016-08-10  6:43 ` [PATCH v2 3/5] arm: dts: apq8084: " Rajendra Nayak
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 9+ messages in thread
From: Rajendra Nayak @ 2016-08-10  6:43 UTC (permalink / raw)
  To: andy.gross; +Cc: linux-arm-msm, devicetree, linux-kernel, Rajendra Nayak

TSENS is part of GCC, hence add TSENS properties as part of GCC node.
Also add thermal zones and qfprom nodes.
Update GCC bindings doc to mention the possibility of optional TSENS
properties that can be part of GCC node.

Acked-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
 .../devicetree/bindings/clock/qcom,gcc.txt         |  18 ++++
 arch/arm/boot/dts/qcom-apq8064.dtsi                | 103 +++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
index 9a60fde..16e2f84 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
@@ -23,6 +23,13 @@ Required properties :
 Optional properties :
 - #power-domain-cells : shall contain 1
 
+Optional properties:
+- Qualcomm TSENS (thermal sensor device) on some devices can
+be part of GCC and hence the TSENS properties can also be
+part of the GCC/clock-controller node.
+For more details on the TSENS properties please refer
+Documentation/devicetree/bindings/thermal/qcom-tsens.txt
+
 Example:
 	clock-controller@900000 {
 		compatible = "qcom,gcc-msm8960";
@@ -31,3 +38,14 @@ Example:
 		#reset-cells = <1>;
 		#power-domain-cells = <1>;
 	};
+
+Example of GCC with TSENS properties:
+	clock-controller@900000 {
+		compatible = "qcom,gcc-apq8064";
+		reg = <0x00900000 0x4000>;
+		nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+		nvmem-cell-names = "calib", "calib_backup";
+		#clock-cells = <1>;
+		#reset-cells = <1>;
+		#thermal-sensor-cells = <1>;
+	};
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 74a9b6c..9cd13ab 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -86,6 +86,92 @@
 		};
 	};
 
+	thermal-zones {
+		cpu-thermal0 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&gcc 7>;
+			coefficients = <1199 0>;
+
+			trips {
+				cpu_alert0: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit0: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal1 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&gcc 8>;
+			coefficients = <1132 0>;
+
+			trips {
+				cpu_alert1: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit1: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal2 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&gcc 9>;
+			coefficients = <1199 0>;
+
+			trips {
+				cpu_alert2: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit2: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal3 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&gcc 10>;
+			coefficients = <1132 0>;
+
+			trips {
+				cpu_alert3: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit3: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	cpu-pmu {
 		compatible = "qcom,krait-pmu";
 		interrupts = <1 10 0x304>;
@@ -611,11 +697,28 @@
 			};
 		};
 
+		qfprom: qfprom@00700000 {
+			compatible	= "qcom,qfprom";
+			reg		= <0x00700000 0x1000>;
+			#address-cells	= <1>;
+			#size-cells	= <1>;
+			ranges;
+			tsens_calib: calib {
+				reg = <0x404 0x10>;
+			};
+			tsens_backup: backup_calib {
+				reg = <0x414 0x10>;
+			};
+		};
+
 		gcc: clock-controller@900000 {
 			compatible = "qcom,gcc-apq8064";
 			reg = <0x00900000 0x4000>;
+			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+			nvmem-cell-names = "calib", "calib_backup";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
+			#thermal-sensor-cells = <1>;
 		};
 
 		lcc: clock-controller@28000000 {
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v2 3/5] arm: dts: apq8084: Add thermal zones, tsens and qfprom nodes
  2016-08-10  6:43 [PATCH v2 0/5] dts patches for qcom tsens support Rajendra Nayak
  2016-08-10  6:43 ` [PATCH v2 1/5] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes Rajendra Nayak
  2016-08-10  6:43 ` [PATCH v2 2/5] arm: dts: apq8064: " Rajendra Nayak
@ 2016-08-10  6:43 ` Rajendra Nayak
  2016-08-10  6:43 ` [PATCH v2 4/5] arm64: dts: msm8916: " Rajendra Nayak
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Rajendra Nayak @ 2016-08-10  6:43 UTC (permalink / raw)
  To: andy.gross; +Cc: linux-arm-msm, devicetree, linux-kernel, Rajendra Nayak

Add thermal zones, tsens and qfprom nodes

Acked-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
 arch/arm/boot/dts/qcom-apq8084.dtsi | 103 ++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
index 7c2df06..39eb7a4 100644
--- a/arch/arm/boot/dts/qcom-apq8084.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -94,6 +94,88 @@
 		};
 	};
 
+	thermal-zones {
+		cpu-thermal0 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 5>;
+
+			trips {
+				cpu_alert0: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit0: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal1 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 6>;
+
+			trips {
+				cpu_alert1: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit1: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal2 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 7>;
+
+			trips {
+				cpu_alert2: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit2: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal3 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 8>;
+
+			trips {
+				cpu_alert3: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit3: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	cpu-pmu {
 		compatible = "qcom,krait-pmu";
 		interrupts = <1 7 0xf04>;
@@ -150,6 +232,27 @@
 			reg = <0xf9011000 0x1000>;
 		};
 
+		qfprom: qfprom@fc4bc000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "qcom,qfprom";
+			reg = <0xfc4bc000 0x1000>;
+			tsens_calib: calib@d0 {
+				reg = <0xd0 0x18>;
+			};
+			tsens_backup: backup@440 {
+				reg = <0x440 0x10>;
+			};
+		};
+
+		tsens: thermal-sensor@fc4a8000 {
+			compatible = "qcom,msm8974-tsens";
+			reg = <0xfc4a8000 0x2000>;
+			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+			nvmem-cell-names = "calib", "calib_backup";
+			#thermal-sensor-cells = <1>;
+		};
+
 		timer@f9020000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v2 4/5] arm64: dts: msm8916: Add thermal zones, tsens and qfprom nodes
  2016-08-10  6:43 [PATCH v2 0/5] dts patches for qcom tsens support Rajendra Nayak
                   ` (2 preceding siblings ...)
  2016-08-10  6:43 ` [PATCH v2 3/5] arm: dts: apq8084: " Rajendra Nayak
@ 2016-08-10  6:43 ` Rajendra Nayak
  2016-08-10  6:43 ` [PATCH v2 5/5] arm64: dts: msm8996: " Rajendra Nayak
  2016-08-11  3:22 ` [PATCH v2 0/5] dts patches for qcom tsens support Andy Gross
  5 siblings, 0 replies; 9+ messages in thread
From: Rajendra Nayak @ 2016-08-10  6:43 UTC (permalink / raw)
  To: andy.gross; +Cc: linux-arm-msm, devicetree, linux-kernel, Rajendra Nayak

Add thermal zones, tsens and qfprom nodes

Acked-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 64 +++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 11bdc24..4bc047b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -155,6 +155,49 @@
 		interrupts = <GIC_PPI 7 GIC_CPU_MASK_SIMPLE(4)>;
 	};
 
+	thermal-zones {
+		cpu-thermal0 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 4>;
+
+			trips {
+				cpu_alert0: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit0: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal1 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens 3>;
+
+			trips {
+				cpu_alert1: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+				cpu_crit1: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -609,6 +652,27 @@
 			clocks = <&gcc GCC_PRNG_AHB_CLK>;
 			clock-names = "core";
 		};
+
+		qfprom: qfprom@5c000 {
+			compatible = "qcom,qfprom";
+			reg = <0x5c000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			tsens_caldata: caldata@d0 {
+				reg = <0xd0 0x8>;
+			};
+			tsens_calsel: calsel@ec {
+				reg = <0xec 0x4>;
+			};
+		};
+
+		tsens: thermal-sensor@4a8000 {
+			compatible = "qcom,msm8916-tsens";
+			reg = <0x4a8000 0x2000>;
+			nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
+			nvmem-cell-names = "calib", "calib_sel";
+			#thermal-sensor-cells = <1>;
+		};
 	};
 
 	smd {
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v2 5/5] arm64: dts: msm8996: Add thermal zones, tsens and qfprom nodes
  2016-08-10  6:43 [PATCH v2 0/5] dts patches for qcom tsens support Rajendra Nayak
                   ` (3 preceding siblings ...)
  2016-08-10  6:43 ` [PATCH v2 4/5] arm64: dts: msm8916: " Rajendra Nayak
@ 2016-08-10  6:43 ` Rajendra Nayak
  2016-08-11  3:22 ` [PATCH v2 0/5] dts patches for qcom tsens support Andy Gross
  5 siblings, 0 replies; 9+ messages in thread
From: Rajendra Nayak @ 2016-08-10  6:43 UTC (permalink / raw)
  To: andy.gross; +Cc: linux-arm-msm, devicetree, linux-kernel, Rajendra Nayak

Add thermal zones, tsens and qfprom nodes

Acked-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 92 +++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 55ec3e8..f52cba3 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -97,6 +97,92 @@
 		};
 	};
 
+	thermal-zones {
+		cpu-thermal0 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens0 3>;
+
+			trips {
+				cpu_alert0: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu_crit0: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal1 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens0 5>;
+
+			trips {
+				cpu_alert1: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu_crit1: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal2 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens0 8>;
+
+			trips {
+				cpu_alert2: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu_crit2: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		cpu-thermal3 {
+			polling-delay-passive = <250>;
+			polling-delay = <1000>;
+
+			thermal-sensors = <&tsens0 10>;
+
+			trips {
+				cpu_alert3: trip0 {
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu_crit3: trip1 {
+					temperature = <110000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -181,6 +267,12 @@
 			status = "disabled";
 		};
 
+		tsens0: thermal-sensor@4a8000 {
+			compatible = "qcom,msm8996-tsens";
+			reg = <0x4a8000 0x2000>;
+			#thermal-sensor-cells = <1>;
+		};
+
 		blsp2_uart1: serial@75b0000 {
 			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
 			reg = <0x75b0000 0x1000>;
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH v2 0/5] dts patches for qcom tsens support
  2016-08-10  6:43 [PATCH v2 0/5] dts patches for qcom tsens support Rajendra Nayak
                   ` (4 preceding siblings ...)
  2016-08-10  6:43 ` [PATCH v2 5/5] arm64: dts: msm8996: " Rajendra Nayak
@ 2016-08-11  3:22 ` Andy Gross
  5 siblings, 0 replies; 9+ messages in thread
From: Andy Gross @ 2016-08-11  3:22 UTC (permalink / raw)
  To: Rajendra Nayak; +Cc: linux-arm-msm, devicetree, linux-kernel

On Wed, Aug 10, 2016 at 12:13:54PM +0530, Rajendra Nayak wrote:
> Hey Andy,
> 
> Tsens driver patches are pulled in by Eduardo [1]
> but looks like they missed the 4.8 merge window.
> Nevertheless, these are dts changes for the various platforms
> supported by the driver, which are acked by Eduardo.
> Can you please pull these in for 4.9? (I am hoping the driver
> would be merged in in 4.9 as well)

Ok, I'll look to pull these in.  If I see any issues I'll let you know.


regards,

Andy

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v2 2/5] arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
  2016-08-10  6:43 ` [PATCH v2 2/5] arm: dts: apq8064: " Rajendra Nayak
@ 2016-08-12 18:13   ` Rob Herring
  2016-08-16  6:44     ` Rajendra Nayak
  0 siblings, 1 reply; 9+ messages in thread
From: Rob Herring @ 2016-08-12 18:13 UTC (permalink / raw)
  To: Rajendra Nayak; +Cc: andy.gross, linux-arm-msm, devicetree, linux-kernel

On Wed, Aug 10, 2016 at 12:13:56PM +0530, Rajendra Nayak wrote:
> TSENS is part of GCC, hence add TSENS properties as part of GCC node.
> Also add thermal zones and qfprom nodes.
> Update GCC bindings doc to mention the possibility of optional TSENS
> properties that can be part of GCC node.
> 
> Acked-by: Eduardo Valentin <edubezval@gmail.com>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> ---
>  .../devicetree/bindings/clock/qcom,gcc.txt         |  18 ++++
>  arch/arm/boot/dts/qcom-apq8064.dtsi                | 103 +++++++++++++++++++++
>  2 files changed, 121 insertions(+)

A couple of nits, otherwise:

Acked-by: Rob Herring <robh@kernel.org>

> 
> diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
> index 9a60fde..16e2f84 100644
> --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt
> +++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
> @@ -23,6 +23,13 @@ Required properties :
>  Optional properties :
>  - #power-domain-cells : shall contain 1
>  
> +Optional properties:

It already has this section above.

> +- Qualcomm TSENS (thermal sensor device) on some devices can
> +be part of GCC and hence the TSENS properties can also be
> +part of the GCC/clock-controller node.
> +For more details on the TSENS properties please refer
> +Documentation/devicetree/bindings/thermal/qcom-tsens.txt
> +
>  Example:
>  	clock-controller@900000 {
>  		compatible = "qcom,gcc-msm8960";
> @@ -31,3 +38,14 @@ Example:
>  		#reset-cells = <1>;
>  		#power-domain-cells = <1>;
>  	};
> +
> +Example of GCC with TSENS properties:
> +	clock-controller@900000 {
> +		compatible = "qcom,gcc-apq8064";
> +		reg = <0x00900000 0x4000>;
> +		nvmem-cells = <&tsens_calib>, <&tsens_backup>;
> +		nvmem-cell-names = "calib", "calib_backup";
> +		#clock-cells = <1>;
> +		#reset-cells = <1>;
> +		#thermal-sensor-cells = <1>;
> +	};
> diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
> index 74a9b6c..9cd13ab 100644
> --- a/arch/arm/boot/dts/qcom-apq8064.dtsi
> +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
> @@ -86,6 +86,92 @@
>  		};
>  	};
>  
> +	thermal-zones {
> +		cpu-thermal0 {
> +			polling-delay-passive = <250>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&gcc 7>;
> +			coefficients = <1199 0>;
> +
> +			trips {
> +				cpu_alert0: trip0 {
> +					temperature = <75000>;
> +					hysteresis = <2000>;
> +					type = "passive";
> +				};
> +				cpu_crit0: trip1 {
> +					temperature = <110000>;
> +					hysteresis = <2000>;
> +					type = "critical";
> +				};
> +			};
> +		};
> +
> +		cpu-thermal1 {
> +			polling-delay-passive = <250>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&gcc 8>;
> +			coefficients = <1132 0>;
> +
> +			trips {
> +				cpu_alert1: trip0 {
> +					temperature = <75000>;
> +					hysteresis = <2000>;
> +					type = "passive";
> +				};
> +				cpu_crit1: trip1 {
> +					temperature = <110000>;
> +					hysteresis = <2000>;
> +					type = "critical";
> +				};
> +			};
> +		};
> +
> +		cpu-thermal2 {
> +			polling-delay-passive = <250>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&gcc 9>;
> +			coefficients = <1199 0>;
> +
> +			trips {
> +				cpu_alert2: trip0 {
> +					temperature = <75000>;
> +					hysteresis = <2000>;
> +					type = "passive";
> +				};
> +				cpu_crit2: trip1 {
> +					temperature = <110000>;
> +					hysteresis = <2000>;
> +					type = "critical";
> +				};
> +			};
> +		};
> +
> +		cpu-thermal3 {
> +			polling-delay-passive = <250>;
> +			polling-delay = <1000>;
> +
> +			thermal-sensors = <&gcc 10>;
> +			coefficients = <1132 0>;
> +
> +			trips {
> +				cpu_alert3: trip0 {
> +					temperature = <75000>;
> +					hysteresis = <2000>;
> +					type = "passive";
> +				};
> +				cpu_crit3: trip1 {
> +					temperature = <110000>;
> +					hysteresis = <2000>;
> +					type = "critical";
> +				};
> +			};
> +		};
> +	};
> +
>  	cpu-pmu {
>  		compatible = "qcom,krait-pmu";
>  		interrupts = <1 10 0x304>;
> @@ -611,11 +697,28 @@
>  			};
>  		};
>  
> +		qfprom: qfprom@00700000 {

Drop leading 0s.

> +			compatible	= "qcom,qfprom";
> +			reg		= <0x00700000 0x1000>;
> +			#address-cells	= <1>;
> +			#size-cells	= <1>;
> +			ranges;
> +			tsens_calib: calib {
> +				reg = <0x404 0x10>;
> +			};
> +			tsens_backup: backup_calib {
> +				reg = <0x414 0x10>;
> +			};
> +		};
> +
>  		gcc: clock-controller@900000 {
>  			compatible = "qcom,gcc-apq8064";
>  			reg = <0x00900000 0x4000>;
> +			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
> +			nvmem-cell-names = "calib", "calib_backup";
>  			#clock-cells = <1>;
>  			#reset-cells = <1>;
> +			#thermal-sensor-cells = <1>;
>  		};
>  
>  		lcc: clock-controller@28000000 {
> -- 
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
> 
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v2 2/5] arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
  2016-08-12 18:13   ` Rob Herring
@ 2016-08-16  6:44     ` Rajendra Nayak
  0 siblings, 0 replies; 9+ messages in thread
From: Rajendra Nayak @ 2016-08-16  6:44 UTC (permalink / raw)
  To: Rob Herring; +Cc: andy.gross, linux-arm-msm, devicetree, linux-kernel



On 08/12/2016 11:43 PM, Rob Herring wrote:
> On Wed, Aug 10, 2016 at 12:13:56PM +0530, Rajendra Nayak wrote:
>> TSENS is part of GCC, hence add TSENS properties as part of GCC node.
>> Also add thermal zones and qfprom nodes.
>> Update GCC bindings doc to mention the possibility of optional TSENS
>> properties that can be part of GCC node.
>>
>> Acked-by: Eduardo Valentin <edubezval@gmail.com>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>> ---
>>  .../devicetree/bindings/clock/qcom,gcc.txt         |  18 ++++
>>  arch/arm/boot/dts/qcom-apq8064.dtsi                | 103 +++++++++++++++++++++
>>  2 files changed, 121 insertions(+)
> 
> A couple of nits, otherwise:
> 
> Acked-by: Rob Herring <robh@kernel.org>

Thanks Rob, I will fix the ones below and respin.

> 
>>
>> diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
>> index 9a60fde..16e2f84 100644
>> --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt
>> +++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
>> @@ -23,6 +23,13 @@ Required properties :
>>  Optional properties :
>>  - #power-domain-cells : shall contain 1
>>  
>> +Optional properties:
> 
> It already has this section above.
> 
>> +- Qualcomm TSENS (thermal sensor device) on some devices can
>> +be part of GCC and hence the TSENS properties can also be
>> +part of the GCC/clock-controller node.
>> +For more details on the TSENS properties please refer
>> +Documentation/devicetree/bindings/thermal/qcom-tsens.txt
>> +
>>  Example:
>>  	clock-controller@900000 {
>>  		compatible = "qcom,gcc-msm8960";
>> @@ -31,3 +38,14 @@ Example:
>>  		#reset-cells = <1>;
>>  		#power-domain-cells = <1>;
>>  	};
>> +
>> +Example of GCC with TSENS properties:
>> +	clock-controller@900000 {
>> +		compatible = "qcom,gcc-apq8064";
>> +		reg = <0x00900000 0x4000>;
>> +		nvmem-cells = <&tsens_calib>, <&tsens_backup>;
>> +		nvmem-cell-names = "calib", "calib_backup";
>> +		#clock-cells = <1>;
>> +		#reset-cells = <1>;
>> +		#thermal-sensor-cells = <1>;
>> +	};
>> diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
>> index 74a9b6c..9cd13ab 100644
>> --- a/arch/arm/boot/dts/qcom-apq8064.dtsi
>> +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
>> @@ -86,6 +86,92 @@
>>  		};
>>  	};
>>  
>> +	thermal-zones {
>> +		cpu-thermal0 {
>> +			polling-delay-passive = <250>;
>> +			polling-delay = <1000>;
>> +
>> +			thermal-sensors = <&gcc 7>;
>> +			coefficients = <1199 0>;
>> +
>> +			trips {
>> +				cpu_alert0: trip0 {
>> +					temperature = <75000>;
>> +					hysteresis = <2000>;
>> +					type = "passive";
>> +				};
>> +				cpu_crit0: trip1 {
>> +					temperature = <110000>;
>> +					hysteresis = <2000>;
>> +					type = "critical";
>> +				};
>> +			};
>> +		};
>> +
>> +		cpu-thermal1 {
>> +			polling-delay-passive = <250>;
>> +			polling-delay = <1000>;
>> +
>> +			thermal-sensors = <&gcc 8>;
>> +			coefficients = <1132 0>;
>> +
>> +			trips {
>> +				cpu_alert1: trip0 {
>> +					temperature = <75000>;
>> +					hysteresis = <2000>;
>> +					type = "passive";
>> +				};
>> +				cpu_crit1: trip1 {
>> +					temperature = <110000>;
>> +					hysteresis = <2000>;
>> +					type = "critical";
>> +				};
>> +			};
>> +		};
>> +
>> +		cpu-thermal2 {
>> +			polling-delay-passive = <250>;
>> +			polling-delay = <1000>;
>> +
>> +			thermal-sensors = <&gcc 9>;
>> +			coefficients = <1199 0>;
>> +
>> +			trips {
>> +				cpu_alert2: trip0 {
>> +					temperature = <75000>;
>> +					hysteresis = <2000>;
>> +					type = "passive";
>> +				};
>> +				cpu_crit2: trip1 {
>> +					temperature = <110000>;
>> +					hysteresis = <2000>;
>> +					type = "critical";
>> +				};
>> +			};
>> +		};
>> +
>> +		cpu-thermal3 {
>> +			polling-delay-passive = <250>;
>> +			polling-delay = <1000>;
>> +
>> +			thermal-sensors = <&gcc 10>;
>> +			coefficients = <1132 0>;
>> +
>> +			trips {
>> +				cpu_alert3: trip0 {
>> +					temperature = <75000>;
>> +					hysteresis = <2000>;
>> +					type = "passive";
>> +				};
>> +				cpu_crit3: trip1 {
>> +					temperature = <110000>;
>> +					hysteresis = <2000>;
>> +					type = "critical";
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>>  	cpu-pmu {
>>  		compatible = "qcom,krait-pmu";
>>  		interrupts = <1 10 0x304>;
>> @@ -611,11 +697,28 @@
>>  			};
>>  		};
>>  
>> +		qfprom: qfprom@00700000 {
> 
> Drop leading 0s.
> 
>> +			compatible	= "qcom,qfprom";
>> +			reg		= <0x00700000 0x1000>;
>> +			#address-cells	= <1>;
>> +			#size-cells	= <1>;
>> +			ranges;
>> +			tsens_calib: calib {
>> +				reg = <0x404 0x10>;
>> +			};
>> +			tsens_backup: backup_calib {
>> +				reg = <0x414 0x10>;
>> +			};
>> +		};
>> +
>>  		gcc: clock-controller@900000 {
>>  			compatible = "qcom,gcc-apq8064";
>>  			reg = <0x00900000 0x4000>;
>> +			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
>> +			nvmem-cell-names = "calib", "calib_backup";
>>  			#clock-cells = <1>;
>>  			#reset-cells = <1>;
>> +			#thermal-sensor-cells = <1>;
>>  		};
>>  
>>  		lcc: clock-controller@28000000 {
>> -- 
>> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
>> of Code Aurora Forum, hosted by The Linux Foundation
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe devicetree" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2016-08-16  6:44 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-10  6:43 [PATCH v2 0/5] dts patches for qcom tsens support Rajendra Nayak
2016-08-10  6:43 ` [PATCH v2 1/5] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes Rajendra Nayak
2016-08-10  6:43 ` [PATCH v2 2/5] arm: dts: apq8064: " Rajendra Nayak
2016-08-12 18:13   ` Rob Herring
2016-08-16  6:44     ` Rajendra Nayak
2016-08-10  6:43 ` [PATCH v2 3/5] arm: dts: apq8084: " Rajendra Nayak
2016-08-10  6:43 ` [PATCH v2 4/5] arm64: dts: msm8916: " Rajendra Nayak
2016-08-10  6:43 ` [PATCH v2 5/5] arm64: dts: msm8996: " Rajendra Nayak
2016-08-11  3:22 ` [PATCH v2 0/5] dts patches for qcom tsens support Andy Gross

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).