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

Commit 80655421 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: Add case_therm based thermal zone config for MSM8953"

parents 3e0cc86b fc7be8b0

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

+6 −0
Original line number Diff line number Diff line
@@ -197,3 +197,9 @@ 
		};

	};

};



&thermal_zones {

	case-therm-step {

		status = "disabled";

	};

};

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

+97 −0
Original line number Diff line number Diff line
@@ -253,6 +253,21 @@ 
		};

	};



	case-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8953_vadc 0x13>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	gpu1-step {

		polling-delay-passive = <250>;

		polling-delay = <0>;
@@ -1102,4 +1117,86 @@ 
			};

		};

	};



	case-therm-step {

		polling-delay-passive = <2000>;

		polling-delay = <0>;

		thermal-sensors = <&pm8953_vadc 0x13>;

		thermal-governor = "step_wise";



		trips {

			cpus_trip: cpus-trip {

				temperature = <43000>;

				hysteresis = <0>;

				type = "passive";

			};

			modem_trip0: modem-trip0 {

				temperature = <45000>;

				hysteresis = <2000>;

				type = "passive";

			};

			modem_trip1: modem-trip1 {

				temperature = <48000>;

				hysteresis = <3000>;

				type = "passive";

			};

			modem_trip2: modem-trip2 {

				temperature = <54000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			skin_cpu0 {

				trip = <&cpus_trip>;

				/* throttle from fmax to 1689600KHz */

				cooling-device = <&CPU0 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu1 {

				trip = <&cpus_trip>;

				cooling-device = <&CPU1 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu2 {

				trip = <&cpus_trip>;

				cooling-device = <&CPU2 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu3 {

				trip = <&cpus_trip>;

				cooling-device = <&CPU3 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu4 {

				trip = <&cpus_trip>;

				cooling-device = <&CPU4 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu5 {

				trip = <&cpus_trip>;

				cooling-device = <&CPU5 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu6 {

				trip = <&cpus_trip>;

				cooling-device = <&CPU6 THERMAL_NO_LIMIT 3>;

			};

			skin_cpu7 {

				trip = <&cpus_trip>;

				cooling-device = <&CPU7 THERMAL_NO_LIMIT 3>;

			};

			modem_lvl1 {

				trip = <&modem_trip1>;

				cooling-device = <&modem_pa 2 2>;

			};

			modem_lvl2 {

				trip = <&modem_trip2>;

				cooling-device = <&modem_pa 3 3>;

			};

			modem_proc_lvl1 {

				trip = <&modem_trip0>;

				cooling-device = <&modem_proc 1 1>;

			};

			modem_proc_lvl2 {

				trip = <&modem_trip2>;

				cooling-device = <&modem_proc 3 3>;

			};

		};

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ 
				qcom,scale-function = <2>;

				qcom,hw-settle-time = <2>;

				qcom,fast-avg-setup = <0>;

				qcom,vadc-thermal-node;

			};

		};

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

+122 −0
Original line number Diff line number Diff line
@@ -219,10 +219,15 @@ 
			compatible = "qcom,qpnp-smb5";

			#address-cells = <1>;

			#size-cells = <1>;

			#cooling-cells = <2>;



			qcom,pmic-revid = <&pmi632_revid>;

			dpdm-supply = <&qusb_phy>;



			qcom,thermal-mitigation

				= <3000000 2500000 2000000 1500000

					1000000 500000>;



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =
@@ -407,6 +412,21 @@ 
				reg = <0xb100 0x100>;

			};

		};



		bcl_sensor: bcl@3d00 {

			compatible = "qcom,msm-bcl-pmic5";

			reg = <0x3d00 0xff>;

			interrupts = <0x2 0x3d 0x0 IRQ_TYPE_NONE>,

					<0x2 0x3d 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-high-ibat",

						"bcl-low-vbat";

			#thermal-sensor-cells = <1>;

		};



		bcl_soc: bcl-soc {

			compatible = "qcom,msm-bcl-soc";

			#thermal-sensor-cells = <0>;

		};

	};



	pmi632_3: qcom,pmi632@3 {
@@ -574,3 +594,105 @@ 
		qcom,switch-source = <&pmi632_switch0>;

	};

};



&thermal_zones {

	ibat-high {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&bcl_sensor 0>;



		trips {

			pmi632_ibat:ibat-high {

				temperature = <3500>;

				hysteresis = <200>;

				type = "passive";

			};

		};

	};



	vbat_low {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&bcl_sensor 2>;

		tracks-low;



		trips {

			pmi632_vbat_low: vbat-low {

				temperature = <3000>;

				hysteresis = <100>;

				type = "passive";

			};

		};



		cooling-maps {

			vbat_map4 {

				trip = <&pmi632_vbat_low>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vbat_map5 {

				trip = <&pmi632_vbat_low>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vbat_map6 {

				trip = <&pmi632_vbat_low>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vbat_map7 {

				trip = <&pmi632_vbat_low>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	soc {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&bcl_soc>;

		tracks-low;



		trips {

			pmi632_low_soc: low-soc {

				temperature = <10>;

				hysteresis = <0>;

				type = "passive";

			};

		};

		cooling-maps {

			soc_map4 {

				trip = <&pmi632_low_soc>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			soc_map5 {

				trip = <&pmi632_low_soc>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			soc_map6 {

				trip = <&pmi632_low_soc>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			soc_map7 {

				trip = <&pmi632_low_soc>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};

};

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

+46 −0
Original line number Diff line number Diff line
@@ -60,3 +60,49 @@ 
&pm8953_pwm {

	status = "ok";

};



&thermal_zones {

	case-therm-step {

		trips {

			batt_trip1: batt-trip1 {

				temperature = <38000>;

				hysteresis = <3000>;

				type = "passive";

			};

			batt_trip2: batt-trip2 {

				temperature = <40000>;

				hysteresis = <2000>;

				type = "passive";

			};

			batt_trip3: batt-trip3 {

				temperature = <43000>;

				hysteresis = <3000>;

				type = "passive";

			};

			batt_trip4: batt-trip4 {

				temperature = <48000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			battery_lvl1 {

				trip = <&batt_trip1>;

				cooling-device = <&pmi632_charger 2 2>;

			};

			battery_lvl2 {

				trip = <&batt_trip2>;

				cooling-device = <&pmi632_charger 3 3>;

			};

			battery_lvl3 {

				trip = <&batt_trip3>;

				cooling-device = <&pmi632_charger 4 4>;

			};

			battery_lvl4 {

				trip = <&batt_trip4>;

				cooling-device = <&pmi632_charger 5 5>;

			};

		};

	};

};