Revert "ipq806x: add thermal sensors driver"

This reverts commit 815122f.
dissent1 · Nov 22, 2016 · 08d9b8d · 08d9b8d
1 parent 815122f
commit 08d9b8d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1,540 deletions.
diff --git a/target/linux/ipq806x/config-4.4 b/target/linux/ipq806x/config-4.4
@@ -363,7 +363,6 @@ CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_32=y
 # CONFIG_QCOM_SMD is not set
 CONFIG_QCOM_SMEM=y
-CONFIG_QCOM_TSENS=y
 CONFIG_QCOM_WDT=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065.dtsi
@@ -119,88 +119,6 @@
 		};
 	};
 
-	thermal-zones {
-		cpu-thermal0 {
-			polling-delay-passive = <250>;
-			polling-delay = <1000>;
-
-			thermal-sensors = <&tsens 7>;
-
-			trips {
-				cpu_alert0: trip@0 {
-					temperature = <75000>;
-					hysteresis = <2000>;
-					type = "passive";
-				};
-				cpu_crit0: trip@1 {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "critical";
-				};
-			};
-		};
-
-		cpu-thermal1 {
-			polling-delay-passive = <250>;
-			polling-delay = <1000>;
-
-			thermal-sensors = <&tsens 8>;
-
-			trips {
-				cpu_alert1: trip@0 {
-					temperature = <75000>;
-					hysteresis = <2000>;
-					type = "passive";
-				};
-				cpu_crit1: trip@1 {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "critical";
-				};
-			};
-		};
-
-		cpu-thermal2 {
-			polling-delay-passive = <250>;
-			polling-delay = <1000>;
-
-			thermal-sensors = <&tsens 9>;
-
-			trips {
-				cpu_alert2: trip@0 {
-					temperature = <75000>;
-					hysteresis = <2000>;
-					type = "passive";
-				};
-				cpu_crit2: trip@1 {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "critical";
-				};
-			};
-		};
-
-		cpu-thermal3 {
-			polling-delay-passive = <250>;
-			polling-delay = <1000>;
-
-			thermal-sensors = <&tsens 10>;
-
-			trips {
-				cpu_alert3: trip@0 {
-					temperature = <75000>;
-					hysteresis = <2000>;
-					type = "passive";
-				};
-				cpu_crit3: trip@1 {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "critical";
-				};
-			};
-		};
-	};
-
 	cpu-pmu {
 		compatible = "qcom,krait-pmu";
 		interrupts = <1 10 0x304>;
@@ -327,15 +245,8 @@
 			reg = <0x00700000 0x1000>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges;
-
-			tsens_calib: calib {
-				reg = <0x400 0x10>;
-			};
-
-			tsens_backup: backup_calib {
-				reg = <0x410 0x10>;
-			};
+			stride = <1>;
+			ranges = <0x0 0x00700000 0x1000>;
 		};
 
 		rpm@108000 {
@@ -819,18 +730,6 @@
 			#clock-cells = <1>;
 			#reset-cells = <1>;
 			#power-domain-cells = <1>;
-			#address-cells	= <1>;
-			#size-cells	= <1>;
-			ranges;
-
-			tsens: thermal-sensor@900000 {
-				compatible = "qcom,msm8960-tsens";
-				nvmem-cells = <&tsens_calib>, <&tsens_backup>;
-				nvmem-cell-names = "calib", "calib_backup";
-				qcom,tsens-slopes = <1176 1176 1154 1176 1111
-					1132 1132 1199 1132 1199 1132>;
-				#thermal-sensor-cells = <1>;
-			};
 		};
 
 		lcc: clock-controller@28000000 {
@@ -845,6 +744,16 @@
 			reg = <0x1a400000 0x100>;
 		};
 
+		tsens: tsens-ipq806x {
+			compatible = "qcom,ipq806x-tsens";
+			reg = <0x900000 0x3678>, <0x700000 0x420>;
+			reg-names = "tsens_physical", "tsens_eeprom_physical";
+			interrupts = <0 178 0>;
+			qcom,sensors = <11>;
+			qcom,tsens_factor = <1000>;
+			qcom,slope = <1176 1176 1154 1176 1111 1132 1132 1199 1132 1199 1132>;
+		};
+
 		qcom,msm-thermal {
 			compatible = "qcom,msm-thermal";
 			qcom,sensor-id = <0>;

diff --git a/target/linux/ipq806x/patches-4.4/309-clk-qcom-gcc-msm8960-add-child-devices-support.patch b/target/linux/ipq806x/patches-4.4/309-clk-qcom-gcc-msm8960-add-child-devices-support.patch