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

Commit 6813b150 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update thermal configuration for SM8150"

parents d0392122 91bc32f2

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

+3 −3
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ 
	};



	pm8150b-ibat-lvl1 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 1>;
@@ -628,7 +628,7 @@ 
	};



	pm8150b-vbat-lvl1 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150b_bcl 3>;
@@ -644,7 +644,7 @@ 
	};



	pm8150b-vbat-lvl2 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150b_bcl 4>;

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

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ 
	};



	pm8150l-vph-lvl1 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150l_bcl 3>;
@@ -438,7 +438,7 @@ 
	};



	pm8150l-vph-lvl2 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150l_bcl 4>;

arch/arm64/boot/dts/qcom/sm8150-thermal-overlay.dtsi

+67 −6
Original line number Diff line number Diff line
@@ -168,18 +168,41 @@ 
					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vbat_cpu6 {

			vbat_gpu0 {

				trip = <&vbat_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

			};

		};

	};



	pm8150b-vbat-lvl1 {

		cooling-maps {

			vbat_cpu6 {

				trip = <&vbat_lvl1>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vbat_cpu7 {

				trip = <&vbat_lvl0>;

				trip = <&vbat_lvl1>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vbat_gpu1 {

				trip = <&vbat_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

			};

		};

	};



	pm8150b-vbat-lvl2 {

		cooling-maps {

			vbat_gpu2 {

				trip = <&vbat_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

		};

	};
@@ -197,18 +220,31 @@ 
					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			ibat_cpu6 {

			ibat_gpu0 {

				trip = <&ibat_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

			};

		};

	};



	pm8150b-ibat-lvl1 {

		cooling-maps {

			ibat_cpu6 {

				trip = <&ibat_lvl1>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			ibat_cpu7 {

				trip = <&ibat_lvl0>;

				trip = <&ibat_lvl1>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			ibat_gpu1 {

				trip = <&ibat_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

			};

		};

	};
@@ -227,18 +263,43 @@ 
					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vph_cpu6 {

			vph_gpu0 {

				trip = <&vph_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

			};

		};

	};



	pm8150l-vph-lvl1 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu6 {

				trip = <&vph_lvl1>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vph_cpu7 {

				trip = <&vph_lvl0>;

				trip = <&vph_lvl1>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			vph_gpu1 {

				trip = <&vph_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

			};

		};

	};



	pm8150l-vph-lvl2 {

		disable-thermal-zone;

		cooling-maps {

			vph_gpu2 {

				trip = <&vph_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

		};

	};

};

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

+6 −6
Original line number Diff line number Diff line
@@ -2493,7 +2493,7 @@ 
			cpu11_cdev {

				trip = <&cpu11_config>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};
@@ -2515,7 +2515,7 @@ 
			cpu12_cdev {

				trip = <&cpu12_config>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};
@@ -2537,7 +2537,7 @@ 
			cpu13_cdev {

				trip = <&cpu13_config>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};
@@ -2559,7 +2559,7 @@ 
			cpu14_cdev {

				trip = <&cpu14_config>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};
@@ -2581,7 +2581,7 @@ 
			cpu15_cdev {

				trip = <&cpu15_config>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};
@@ -2603,7 +2603,7 @@ 
			cpu16_cdev {

				trip = <&cpu16_config>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};