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

Commit ea48bab5 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: Merge xo_therm based stepwise zones into single thermal zone"

parents aeabb835 4273bf71

arch/arm64/boot/dts/qcom/qcs605-lc.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 


&thermal_zones {



	xo-therm-cpu-step {

	xo-therm-step {

		cooling-maps {

			/delete-node/ skin_cpu2;

			/delete-node/ skin_cpu3;

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

+2 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -365,13 +365,7 @@ 
};



&thermal_zones {

	xo-therm-cpu-step {

		status = "disabled";

	};

	xo-therm-mdm-step {

		status = "disabled";

	};

	xo-therm-batt-step {

	xo-therm-step {

		status = "disabled";

	};

};

arch/arm64/boot/dts/qcom/sdm670-pmic-overlay.dtsi

+1 −6
Original line number Diff line number Diff line
@@ -387,12 +387,7 @@ 
};



&thermal_zones {

	xo-therm-batt-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4c>;

		thermal-governor = "step_wise";



	xo-therm-step {

		trips {

			batt_trip1: batt-trip1 {

				temperature = <50000>;

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

+21 −34
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 
		};

	};



	xo-therm-cpu-step {

	xo-therm-step {

		polling-delay-passive = <2000>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4c>;
@@ -593,6 +593,26 @@ 
				hysteresis = <0>;

				type = "passive";

			};

			modem_trip0: modem-trip0 {

				temperature = <48000>;

				hysteresis = <4000>;

				type = "passive";

			};

			modem_trip1: modem-trip1 {

				temperature = <50000>;

				hysteresis = <4000>;

				type = "passive";

			};

			modem_trip2: modem-trip2 {

				temperature = <52000>;

				hysteresis = <2000>;

				type = "passive";

			};

			modem_trip3: modem-trip3 {

				temperature = <56000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {
@@ -634,39 +654,6 @@ 
				trip = <&silver_trip1>;

				cooling-device = <&CPU5 THERMAL_NO_LIMIT 2>;

			};

		};

	};



	xo-therm-mdm-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4c>;

		thermal-governor = "step_wise";



		trips {

			modem_trip0: modem-trip0 {

				temperature = <48000>;

				hysteresis = <4000>;

				type = "passive";

			};

			modem_trip1: modem-trip1 {

				temperature = <50000>;

				hysteresis = <4000>;

				type = "passive";

			};

			modem_trip2: modem-trip2 {

				temperature = <52000>;

				hysteresis = <2000>;

				type = "passive";

			};

			modem_trip3: modem-trip3 {

				temperature = <56000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			modem_lvl1 {

				trip = <&modem_trip1>;

				cooling-device = <&modem_pa 1 1>;