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

Commit 92495037 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 BCL thermal zone mitigation for msm8909w-pm660"

parents d33f8ae6 a733332d

arch/arm64/boot/dts/qcom/8909w-pm660.dtsi

+89 −4
Original line number Diff line number Diff line
@@ -571,16 +571,101 @@ 
};



&thermal_zones {

	ibat-high {

		polling-delay-passive = <100>;

		trips {

			pm660_ibat_high:ibat-high {

				temperature = <2000>;

				hysteresis = <1000>;

			};

		};

		cooling-maps {

			ibat_map0 {

				trip = <&pm660_ibat_high>;

				cooling-device =

					<&CPU0 (THERMAL_MAX_LIMIT-2)

						(THERMAL_MAX_LIMIT-2)>;

			};

			ibat_map1 {

				trip = <&pm660_ibat_high>;

				cooling-device =

					<&CPU1 (THERMAL_MAX_LIMIT-2)

						(THERMAL_MAX_LIMIT-2)>;

			};

			ibat_map2 {

				trip = <&pm660_ibat_high>;

				cooling-device =

					<&CPU2 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			ibat_map3 {

				trip = <&pm660_ibat_high>;

				cooling-device =

					<&CPU3 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	vbat_adc {

		trips {

			vbat-adc {

				hysteresis = <300>;

			};

		};

		cooling-maps {

			/delete-node/ vbat_map6;

			/delete-node/ vbat_map7;

			vbat_map0 {

				trip = <&pm660_vbat_adc>;

				cooling-device =

					<&CPU0 (THERMAL_MAX_LIMIT-2)

						(THERMAL_MAX_LIMIT-2)>;

			};

			vbat_map1 {

				trip = <&pm660_vbat_adc>;

				cooling-device =

					<&CPU1 (THERMAL_MAX_LIMIT-2)

						(THERMAL_MAX_LIMIT-2)>;

			};

			vbat_map2 {

				trip = <&pm660_vbat_adc>;

				cooling-device =

					<&CPU2 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vbat_map3 {

				trip = <&pm660_vbat_adc>;

				cooling-device =

					<&CPU3 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};

	soc {

		cooling-maps {

		/delete-node/ soc_map6;

		/delete-node/ soc_map7;

			soc_map0 {

				trip = <&pm660_low_soc>;

				cooling-device =

					<&CPU0 (THERMAL_MAX_LIMIT-2)

						(THERMAL_MAX_LIMIT-2)>;

			};

			soc_map1 {

				trip = <&pm660_low_soc>;

				cooling-device =

					<&CPU1 (THERMAL_MAX_LIMIT-2)

						(THERMAL_MAX_LIMIT-2)>;

			};

			soc_map2 {

				trip = <&pm660_low_soc>;

				cooling-device =

					<&CPU2 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			soc_map3 {

				trip = <&pm660_low_soc>;

				cooling-device =

					<&CPU3 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdw3100-msm8909w-1gb-wtp.dts

+0 −28
Original line number Diff line number Diff line
@@ -164,16 +164,6 @@ 
		};

	};



	qcom,msm-thermal {

		vdd-dig-supply = <&pm660_s2_floor_corner>;



		msm_thermal_freq: qcom,vdd-apps-rstr {

			qcom,vdd-rstr-reg = "vdd-apps";

			qcom,levels = <1094400>;

			qcom,freq-req;

		};

	};



	qcom,bg-rsb {

		compatible = "qcom,bg-rsb";

		vdd-ldo1-supply = <&pm660_l11>;
@@ -186,24 +176,6 @@ 
		ssr-reg1-supply = <&pm660_l3>;

		ssr-reg2-supply = <&pm660_l9>;

	};



	qcom,bcl {

		compatible = "qcom,bcl";

		qcom,bcl-enable;

		qcom,bcl-framework-interface;

		qcom,bcl-freq-control-list = <&CPU0 &CPU1 &CPU2 &CPU3>;

		qcom,bcl-hotplug-list = <&CPU2 &CPU3>;

		qcom,bcl-soc-hotplug-list = <&CPU2 &CPU3>;

		qcom,ibat-monitor {

			qcom,low-threshold-uamp = <1000000>;

			qcom,high-threshold-uamp = <2000000>;

			qcom,mitigation-freq-khz = <1094400>;

			qcom,vph-high-threshold-uv = <3500000>;

			qcom,vph-low-threshold-uv = <3200000>;

			qcom,soc-low-threshold = <10>;

			qcom,thermal-handle = <&msm_thermal_freq>;

		};

	};

};



&audio_codec_mtp {

arch/arm64/boot/dts/qcom/sdw3100-msm8909w-wtp.dts

+0 −28
Original line number Diff line number Diff line
@@ -163,16 +163,6 @@ 
		};

	};



	qcom,msm-thermal {

		vdd-dig-supply = <&pm660_s2_floor_corner>;



		msm_thermal_freq: qcom,vdd-apps-rstr {

			qcom,vdd-rstr-reg = "vdd-apps";

			qcom,levels = <1094400>;

			qcom,freq-req;

		};

	};



	qcom,bg-rsb {

		compatible = "qcom,bg-rsb";

		vdd-ldo1-supply = <&pm660_l11>;
@@ -185,24 +175,6 @@ 
		ssr-reg1-supply = <&pm660_l3>;

		ssr-reg2-supply = <&pm660_l9>;

	};



	qcom,bcl {

		compatible = "qcom,bcl";

		qcom,bcl-enable;

		qcom,bcl-framework-interface;

		qcom,bcl-freq-control-list = <&CPU0 &CPU1 &CPU2 &CPU3>;

		qcom,bcl-hotplug-list = <&CPU2 &CPU3>;

		qcom,bcl-soc-hotplug-list = <&CPU2 &CPU3>;

		qcom,ibat-monitor {

			qcom,low-threshold-uamp = <1000000>;

			qcom,high-threshold-uamp = <2000000>;

			qcom,mitigation-freq-khz = <1094400>;

			qcom,vph-high-threshold-uv = <3500000>;

			qcom,vph-low-threshold-uv = <3200000>;

			qcom,soc-low-threshold = <10>;

			qcom,thermal-handle = <&msm_thermal_freq>;

		};

	};

};



&audio_codec_mtp {