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

Commit 2755021a 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: Define thermal zone for pm8998_tz sensor in PM8998" into msm-4.9

parents 3ccecfa1 a3115282

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

+29 −1
Original line number Original line Diff line number Diff line
@@ -62,11 +62,12 @@ 
			};

			};

		};

		};





		qcom,temp-alarm@2400 {

		pm8998_tz: qcom,temp-alarm@2400 {

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

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

			reg = <0x2400 0x100>;

			reg = <0x2400 0x100>;

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

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

			label = "pm8998_tz";

			label = "pm8998_tz";

			#thermal-sensor-cells = <0>;

		};

		};





		pm8998_gpios: pinctrl@c000 {

		pm8998_gpios: pinctrl@c000 {
@@ -197,3 +198,30 @@ 
		#size-cells = <0>;

		#size-cells = <0>;

	};

	};

};

};



&thermal_zones {

	pm8998_temp_alarm: pm8998_tz {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8998_tz>;



		trips {

			pm8998_trip0: pm8998-trip0 {

				temperature = <105000>;

				hysteresis = <0>;

				type = "passive";

			};

			pm8998_trip1: pm8998-trip1 {

				temperature = <125000>;

				hysteresis = <0>;

				type = "passive";

			};

			pm8998_trip2: pm8998-trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

			};

		};

	};

};

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

+41 −0
Original line number Original line Diff line number Diff line
@@ -3559,3 +3559,44 @@ 
#include "sdm845-audio.dtsi"

#include "sdm845-audio.dtsi"

#include "sdm845-gpu.dtsi"

#include "sdm845-gpu.dtsi"

#include "sdm845-usb.dtsi"

#include "sdm845-usb.dtsi"



&pm8998_temp_alarm {

	cooling-maps {

		trip0_cpu0 {

			trip = <&pm8998_trip0>;

			cooling-device = <&CPU0 21 21>;

		};

		trip0_cpu4 {

			trip = <&pm8998_trip0>;

			cooling-device = <&CPU4 21 21>;

		};

		trip1_cpu1 {

			trip = <&pm8998_trip1>;

			cooling-device = <&CPU1 22 22>;

		};

		trip1_cpu2 {

			trip = <&pm8998_trip1>;

			cooling-device = <&CPU2 22 22>;

		};

		trip1_cpu3 {

			trip = <&pm8998_trip1>;

			cooling-device = <&CPU3 22 22>;

		};

		trip1_cpu4 {

			trip = <&pm8998_trip1>;

			cooling-device = <&CPU4 22 22>;

		};

		trip1_cpu5 {

			trip = <&pm8998_trip1>;

			cooling-device = <&CPU5 22 22>;

		};

		trip1_cpu6 {

			trip = <&pm8998_trip1>;

			cooling-device = <&CPU6 22 22>;

		};

		trip1_cpu7 {

			trip = <&pm8998_trip1>;

			cooling-device = <&CPU7 22 22>;

		};

	};

};