Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156d0f78 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update adc_tm support for SDM670"

parents 1a286f6a 5afac231

Documentation/devicetree/bindings/thermal/tsens.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
	       should be "qcom,sdm660-tsens" for 660 TSENS driver.

	       should be "qcom,sdm630-tsens" for 630 TSENS driver.

	       should be "qcom,sdm845-tsens" for SDM845 TSENS driver.

	       should be "qcom,tsens24xx" for 2.4 TSENS controller.

	       The compatible property is used to identify the respective controller to use

	       for the corresponding SoC.

- reg : offset and length of the TSENS registers with associated property in reg-names

arch/arm64/boot/dts/qcom/pm660.dtsi

+100 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ 
			qcom,adc_tm-vadc = <&pm660_vadc>;

			qcom,decimation = <0>;

			qcom,fast-avg-setup = <0>;

			#thermal-sensor-cells = <1>;



			chan@83 {

				label = "vph_pwr";
@@ -531,6 +532,28 @@ 
				qcom,btm-channel-number = <0x78>;

				qcom,thermal-node;

			};



			chan@4e {

				label = "emmc_therm";

				reg = <0x4e>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "ratiometric";

				qcom,scale-function = <2>;

				qcom,hw-settle-time = <2>;

				qcom,btm-channel-number = <0x80>;

				qcom,vadc-thermal-node;

			};



			chan@4f {

				label = "pa_therm0";

				reg = <0x4f>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "ratiometric";

				qcom,scale-function = <2>;

				qcom,hw-settle-time = <2>;

				qcom,btm-channel-number = <0x88>;

				qcom,vadc-thermal-node;

			};

		};



		pm660_rradc: rradc@4500 {
@@ -631,3 +654,80 @@ 
		#size-cells = <0>;

	};

};



&thermal_zones {

	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4c>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	msm-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4d>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	emmc-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4e>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm0-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4f>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	quiet-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x51>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm670.dtsi

+318 −0
Original line number Diff line number Diff line
@@ -441,6 +441,324 @@ 
		qcom,pipe-attr-ee;

	};



	thermal_zones: thermal-zones {

		aoss0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 0>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu0-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 1>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu1-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 2>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu2-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 3>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu3-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 4>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu4-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 5>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu5-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 6>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		kryo-l3-0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 7>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		kryo-l3-1-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 8>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu0-gold-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 9>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpu1-gold-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 10>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		gpu0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 11>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		gpu1-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 12>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		aoss1-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 0>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		mdm-dsp-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 1>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		ddr-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 2>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		wlan-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 3>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		compute-hvx-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 4>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		camera-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 5>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		mmss-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 6>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		mdm-core-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 7>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};

	};



	tsens0: tsens@c222000 {

		compatible = "qcom,tsens24xx";

		reg = <0xc222000 0x4>,

		      <0xc263000 0x1ff>;

		reg-names = "tsens_srot_physical",

			    "tsens_tm_physical";

		interrupts = <0 506 0>, <0 508 0>;

		interrupt-names = "tsens-upper-lower", "tsens-critical";

		#thermal-sensor-cells = <1>;

	};



	tsens1: tsens@c223000 {

		compatible = "qcom,tsens24xx";

		reg = <0xc223000 0x4>,

		      <0xc265000 0x1ff>;

		reg-names = "tsens_srot_physical",

			    "tsens_tm_physical";

		interrupts = <0 507 0>, <0 509 0>;

		interrupt-names = "tsens-upper-lower", "tsens-critical";

		#thermal-sensor-cells = <1>;

	};



	timer@0x17c90000{

		#address-cells = <1>;

		#size-cells = <1>;

drivers/thermal/msm-tsens.c

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ static const struct of_device_id tsens_table[] = { 
	{	.compatible = "qcom,sdm845-tsens",

		.data = &data_tsens24xx,

	},

	{	.compatible = "qcom,tsens24xx",

		.data = &data_tsens24xx,

	},

	{}

};

MODULE_DEVICE_TABLE(of, tsens_table);