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

Commit 4c8fe53a 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 BCL thermal zone mitigation for SDM450 with PMI632"

parents 4dc124e0 2c240a61
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -684,14 +684,14 @@

&thermal_zones {
	pmi-ibat-lvl0 {
		polling-delay-passive = <0>;
		polling-delay-passive = <100>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&bcl_sensor 0>;

		trips {
			pmi632_ibat:ibat-lvl0 {
				temperature = <3500>;
			pmi632_ibat_lvl0: ibat-lvl0 {
				temperature = <4000>;
				hysteresis = <200>;
				type = "passive";
			};
@@ -706,7 +706,7 @@

		trips {
			ibat-lvl1 {
				temperature = <4000>;
				temperature = <4200>;
				hysteresis = <200>;
				type = "passive";
			};
+92 −0
Original line number Diff line number Diff line
@@ -63,6 +63,27 @@
&thermal_zones {
	pmi-vbat-lvl0 {
		cooling-maps {
			vbat_map0 {
				trip = <&pmi632_vbat_lvl0>;
				/* throttle from fmax to 1689600KHz */
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			vbat_map1 {
				trip = <&pmi632_vbat_lvl0>;
				cooling-device = <&CPU1 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			vbat_map2 {
				trip = <&pmi632_vbat_lvl0>;
				cooling-device = <&CPU2 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			vbat_map3 {
				trip = <&pmi632_vbat_lvl0>;
				cooling-device = <&CPU3 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			vbat_map4 {
				trip = <&pmi632_vbat_lvl0>;
				cooling-device =
@@ -90,8 +111,79 @@
		};
	};

	pmi-ibat-lvl0 {
		cooling-maps {
			ibat_map0 {
				trip = <&pmi632_ibat_lvl0>;
				/* throttle from fmax to 1689600KHz */
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			ibat_map1 {
				trip = <&pmi632_ibat_lvl0>;
				cooling-device = <&CPU1 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			ibat_map2 {
				trip = <&pmi632_ibat_lvl0>;
				cooling-device = <&CPU2 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			ibat_map3 {
				trip = <&pmi632_ibat_lvl0>;
				cooling-device = <&CPU3 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			ibat_map4 {
				trip = <&pmi632_ibat_lvl0>;
				cooling-device =
					<&CPU4 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};
			ibat_map5 {
				trip = <&pmi632_ibat_lvl0>;
				cooling-device =
					<&CPU5 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};
			ibat_map6 {
				trip = <&pmi632_ibat_lvl0>;
				cooling-device =
					<&CPU6 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};
			ibat_map7 {
				trip = <&pmi632_ibat_lvl0>;
				cooling-device =
					<&CPU7 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};
		};
	};

	soc {
		cooling-maps {
			soc_map0 {
				trip = <&pmi632_low_soc>;
				/* throttle from fmax to 1689600KHz */
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			soc_map1 {
				trip = <&pmi632_low_soc>;
				cooling-device = <&CPU1 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			soc_map2 {
				trip = <&pmi632_low_soc>;
				cooling-device = <&CPU2 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			soc_map3 {
				trip = <&pmi632_low_soc>;
				cooling-device = <&CPU3 (THERMAL_MAX_LIMIT - 4)
						(THERMAL_MAX_LIMIT - 4)>;
			};
			soc_map4 {
				trip = <&pmi632_low_soc>;
				cooling-device =