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

Commit 233882a5 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: Use quiet_therm thermistors for skin mitigation for SDM450"

parents fc5a098f e5b6ec00

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

+4 −0
Original line number Diff line number Diff line
@@ -208,4 +208,8 @@ 
	case-therm-step {

		status = "disabled";

	};



	quiet-therm-step {

		status = "disabled";

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ 
		thermal-governor = "step_wise";

		trips {

			pop_trip: pop-trip {

				temperature = <70000>;

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

arch/arm64/boot/dts/qcom/sdm450-pmi632.dtsi

+101 −9
Original line number Diff line number Diff line
@@ -211,45 +211,137 @@ 
		};

	};



	quiet-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pmi632_adc_tm 0x53>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	case-therm-step {

		status = "disabled";

	};



	quiet-therm-step {

		polling-delay-passive = <2000>;

		polling-delay = <0>;

		thermal-sensors = <&pmi632_adc_tm 0x53>;

		thermal-governor = "step_wise";



		trips {

			batt_trip1: batt-trip1 {

			quiet_batt_trip1: quiet_batt-trip1 {

				temperature = <38000>;

				hysteresis = <3000>;

				type = "passive";

			};

			batt_trip2: batt-trip2 {

			quiet_batt_trip2: quiet_batt-trip2 {

				temperature = <40000>;

				hysteresis = <2000>;

				type = "passive";

			};

			batt_trip3: batt-trip3 {

			quiet_batt_trip3: quiet_batt-trip3 {

				temperature = <43000>;

				hysteresis = <3000>;

				type = "passive";

			};

			batt_trip4: batt-trip4 {

			quiet_cpus_trip: quiet_cpus-trip {

				temperature = <43000>;

				hysteresis = <0>;

				type = "passive";

			};

			quiet_modem_trip0: quiet_modem-trip0 {

				temperature = <45000>;

				hysteresis = <2000>;

				type = "passive";

			};

			quiet_batt_trip4: quiet_batt-trip4 {

				temperature = <48000>;

				hysteresis = <5000>;

				type = "passive";

			};

			quiet_modem_trip1: quiet_modem-trip1 {

				temperature = <48000>;

				hysteresis = <3000>;

				type = "passive";

			};

			quiet_modem_trip2: quiet_modem-trip2 {

				temperature = <54000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			skin_cpu0 {

				trip = <&quiet_cpus_trip>;

				/* throttle from fmax to 1689600KHz */

				cooling-device = <&CPU0 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu1 {

				trip = <&quiet_cpus_trip>;

				cooling-device = <&CPU1 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu2 {

				trip = <&quiet_cpus_trip>;

				cooling-device = <&CPU2 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu3 {

				trip = <&quiet_cpus_trip>;

				cooling-device = <&CPU3 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu4 {

				trip = <&quiet_cpus_trip>;

				cooling-device = <&CPU4 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu5 {

				trip = <&quiet_cpus_trip>;

				cooling-device = <&CPU5 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu6 {

				trip = <&quiet_cpus_trip>;

				cooling-device = <&CPU6 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu7 {

				trip = <&quiet_cpus_trip>;

				cooling-device = <&CPU7 THERMAL_NO_LIMIT 3>;

			};

			modem_lvl1 {

				trip = <&quiet_modem_trip1>;

				cooling-device = <&modem_pa 2 2>;

			};

			modem_lvl2 {

				trip = <&quiet_modem_trip2>;

				cooling-device = <&modem_pa 3 3>;

			};

			modem_proc_lvl1 {

				trip = <&quiet_modem_trip0>;

				cooling-device = <&modem_proc 1 1>;

			};

			modem_proc_lvl2 {

				trip = <&quiet_modem_trip2>;

				cooling-device = <&modem_proc 3 3>;

			};

			battery_lvl1 {

				trip = <&batt_trip1>;

				trip = <&quiet_batt_trip1>;

				cooling-device = <&pmi632_charger 2 2>;

			};

			battery_lvl2 {

				trip = <&batt_trip2>;

				trip = <&quiet_batt_trip2>;

				cooling-device = <&pmi632_charger 3 3>;

			};

			battery_lvl3 {

				trip = <&batt_trip3>;

				trip = <&quiet_batt_trip3>;

				cooling-device = <&pmi632_charger 4 4>;

			};

			battery_lvl4 {

				trip = <&batt_trip4>;

				trip = <&quiet_batt_trip4>;

				cooling-device = <&pmi632_charger 5 5>;

			};

		};

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

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ 
		status = "disabled";

	};



	quiet-therm-step {

		status = "disabled";

	};



	video-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;