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

Commit 4f35897f authored Mar 05, 2018 by Manaf Meethalavalappu Pallikunhi

ARM: dts: msm: move BCL cooling dev configs into sdm450 platform devicetree



The pmic device tree files will be used by multiple platforms with
different core configuration. If BCL cpu cooling devices is configured
on this pmic devicetree, it leads to compilation issue for platform
which shares the same pmic with lesser cores.

Move BCL thermal zone related cooling device configs into sdm450
platform devicetree.

Change-Id: I253201af390c46f64420d8020a6d3faf8f411981
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>

parent fc7be8b0

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

+0 −53

Original line number	Diff line number	Diff line
		@@ -622,33 +622,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 {
		@@ -665,31 +638,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 {