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

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

Merge "ARM: dts: qcom: use separate thermal zone names for modem pa for shima"

parents 37e48863 1f265a56

qcom/shima-qrd.dtsi

+1 −7
Original line number Diff line number Diff line
@@ -265,12 +265,6 @@ 
				type = "passive";

			};



			quiet_modem_skin_trip2: quiet-modem-skin-trip2 {

				temperature = <50000>;

				hysteresis = <4000>;

				type = "passive";

			};



			quiet_cx_trip: quiet-cx-trip {

				temperature = <55000>;

				hysteresis = <5000>;
@@ -331,7 +325,7 @@ 
			};



			modem-skin-cdev2 {

				trip = <&quiet_modem_skin_trip2>;

				trip = <&quiet_cx_trip>;

				cooling-device = <&modem_skin 3 3>;

			};

qcom/shima-thermal.dtsi

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

	};



	modem-lte-sub6-pa1 {

	modem-lte-pa1-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";
@@ -1431,7 +1431,7 @@ 
		};

	};



	modem-lte-sub6-pa2 {

	modem-lte-pa2-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";