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

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

Merge "ARM: dts: qcom: keep all step wise rules before userspace rules for YUPIK"

parents 4610a3cd 4844a371

qcom/holi-qrd.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ 
			};



			modem_trip2: modem-trip2 {

				temperature = <56000>;

				temperature = <54000>;

				hysteresis = <4000>;

				type = "passive";

			};

qcom/holi-thermal-modem.dtsi

+180 −3
Original line number Diff line number Diff line
@@ -133,15 +133,147 @@ 
						"beamer_w_therm",

						"qfe_ret_pa0_fr1",

						"qfe_wtr_pa0_fr1",

						"qfe_wtr_pa1_fr1",

						"qfe_wtr_pa2_fr1",

						"qfe_wtr_pa3_fr1",

						"mmw_pa1",

						"mmw_pa2",

						"mmw_pa3",

						"qfe_wtr0_fr1";

		};

	};

};



&thermal_zones {

	modem-mmw-pa1-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&qmi_sensor

				(QMI_MODEM_INST_ID+QMI_MMW_PA1)>;

		trips {

			mmw_pa1_trip0: mmw-pa1-trip0 {

				temperature = <45000>;

				hysteresis = <2000>;

				type = "passive";

			};



			mmw_pa1_trip1: mmw-pa1-trip1 {

				temperature = <47000>;

				hysteresis = <2000>;

				type = "passive";

			};



			mmw_pa1_trip2: mmw-pa1-trip2 {

				temperature = <56000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			mmw_skin0_cdev0 {

				trip = <&mmw_pa1_trip0>;

				cooling-device = <&modem_mmw_skin0 1 1>;

			};



			mmw_skin0_cdev1 {

				trip = <&mmw_pa1_trip1>;

				cooling-device = <&modem_mmw_skin0 2 2>;

			};



			mmw_skin0_cdev2 {

				trip = <&mmw_pa1_trip2>;

				cooling-device = <&modem_mmw_skin0 3 3>;

			};

		};

	};



	modem-mmw-pa2-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&qmi_sensor

				(QMI_MODEM_INST_ID+QMI_MMW_PA2)>;

		trips {

			mmw_pa2_trip0: mmw-pa2-trip0 {

				temperature = <47000>;

				hysteresis = <2000>;

				type = "passive";

			};



			mmw_pa2_trip1: mmw-pa2-trip1 {

				temperature = <50000>;

				hysteresis = <2000>;

				type = "passive";

			};



			mmw_pa2_trip2: mmw-pa2-trip2 {

				temperature = <56000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			mmw_skin1_cdev0 {

				trip = <&mmw_pa2_trip0>;

				cooling-device = <&modem_mmw_skin1 1 1>;

			};



			mmw_skin1_cdev1 {

				trip = <&mmw_pa2_trip1>;

				cooling-device = <&modem_mmw_skin1 2 2>;

			};



			mmw_skin1_cdev2 {

				trip = <&mmw_pa2_trip2>;

				cooling-device = <&modem_mmw_skin1 3 3>;

			};

		};

	};



	modem-mmw-pa3-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&qmi_sensor

				(QMI_MODEM_INST_ID+QMI_MMW_PA3)>;

		trips {

			mmw_pa3_trip0: mmw-pa3-trip0 {

				temperature = <45000>;

				hysteresis = <2000>;

				type = "passive";

			};



			mmw_pa3_trip1: mmw-pa3-trip1 {

				temperature = <47000>;

				hysteresis = <2000>;

				type = "passive";

			};



			mmw_pa3_trip2: mmw-pa3-trip2 {

				temperature = <56000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			mmw_skin2_cdev0 {

				trip = <&mmw_pa3_trip0>;

				cooling-device = <&modem_mmw_skin2 1 1>;

			};



			mmw_skin2_cdev1 {

				trip = <&mmw_pa3_trip1>;

				cooling-device = <&modem_mmw_skin2 2 2>;

			};



			mmw_skin2_cdev2 {

				trip = <&mmw_pa3_trip2>;

				cooling-device = <&modem_mmw_skin2 3 3>;

			};

		};

	};



	modem-lte-sub6-pa1 {

		polling-delay-passive = <0>;

		polling-delay = <0>;
@@ -396,4 +528,49 @@ 
			};

		};

	};



	modem-mmw-pa1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&qmi_sensor

				(QMI_MODEM_INST_ID+QMI_MMW_PA1)>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	modem-mmw-pa2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&qmi_sensor

				(QMI_MODEM_INST_ID+QMI_MMW_PA2)>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	modem-mmw-pa3-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&qmi_sensor

				(QMI_MODEM_INST_ID+QMI_MMW_PA3)>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

qcom/yupik-thermal.dtsi

+829 −829

File changed.

Preview size limit exceeded, changes collapsed.