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

Commit 5456b06a 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: move BCL cooling dev configs into sdm450 platform devicetree"

parents 5fcab299 4f35897f

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

+0 −53
Original line number Diff line number Diff line
@@ -625,33 +625,6 @@ 
				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 {
@@ -668,31 +641,5 @@ 
				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

+58 −0
Original line number Diff line number Diff line
@@ -62,6 +62,64 @@ 
};



&thermal_zones {

	vbat_low {

		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 {

		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>;

			};

		};

	};



	case-therm-step {

		trips {

			batt_trip1: batt-trip1 {