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

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

Merge changes Idef27607,I47553d2b,I9e3cdbea,Iaae5c645,I1d73367c into msm-next 

* changes:
  ARM: dts: msm: add PMIC temperature alarm devices for SDM855
  defconfig: sdm855: enable PMIC temperature alarm driver
  thermal: qcom-spmi-temp-alarm: add support for threshold set configuration
  thermal: qcom-spmi-temp-alarm: add support for GEN2 rev 1 PMIC peripherals
  thermal: step_wise: suppress compiler warning
parents f4760795 56243868

Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt

+15 −0
Original line number Diff line number Diff line
@@ -15,6 +15,21 @@ Optional properties: 
- io-channels:     Should contain IIO channel specifier for the ADC channel,

                   which report chip die temperature.

- io-channel-names: Should contain "thermal".

- qcom,temperature-threshold-set: Defines the temperature threshold set to

		   configure.  Supported values are 0 to 3.  Each set defines

		   the over-temperature stage 1, 2, and 3 temperature

		   thresholds. If this property is not specified, then set 0

		   will be used by default.

		   Threshold set mapping (TEMP_GEN1, TEMP_GEN2 rev 0):

			0 = {105 C, 125 C, 145 C}

			1 = {110 C, 130 C, 150 C}

			2 = {115 C, 135 C, 155 C}

			3 = {120 C, 140 C, 160 C}

		   Threshold set mapping (TEMP_GEN2 rev 1 and above):

			0 = { 90 C, 110 C, 140 C}

			1 = { 95 C, 115 C, 145 C}

			2 = {100 C, 120 C, 150 C}

			3 = {105 C, 125 C, 155 C}



Example:

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

+35 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
		reg = <0x0 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm855_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			#thermal-sensor-cells = <0>;

			qcom,temperature-threshold-set = <1>;

		};

	};



	qcom,pm855@1 {
@@ -29,3 +37,30 @@ 
		#size-cells = <0>;

	};

};



&thermal_zones {

	pm855_temp_alarm: pm855_tz {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm855_tz>;



		trips {

			trip0 {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip1 {

				temperature = <115000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

			};

		};

	};

};

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

+35 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
		reg = <0x2 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm855b_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x2 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			#thermal-sensor-cells = <0>;

			qcom,temperature-threshold-set = <1>;

		};

	};



	qcom,pm855b@3 {
@@ -29,3 +37,30 @@ 
		#size-cells = <0>;

	};

};



&thermal_zones {

	pm855b_temp_alarm: pm855b_tz {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm855b_tz>;



		trips {

			trip0 {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip1 {

				temperature = <115000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

			};

		};

	};

};

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

+35 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
		reg = <0x4 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm855l_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x4 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			#thermal-sensor-cells = <0>;

			qcom,temperature-threshold-set = <1>;

		};

	};



	qcom,pm855l@5 {
@@ -29,3 +37,30 @@ 
		#size-cells = <0>;

	};

};



&thermal_zones {

	pm855l_temp_alarm: pm855l_tz {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm855l_tz>;



		trips {

			trip0 {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip1 {

				temperature = <115000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

			};

		};

	};

};

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

+3 −0
Original line number Diff line number Diff line
@@ -1784,6 +1784,9 @@ 
				 <DCC_READ 0x0c201244 1 0>,

				 <DCC_READ 0x0c202244 1 0>;

	};



	thermal_zones: thermal-zones {

	};

};



&emac_gdsc {