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

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

Merge "ARM: dts: qcom: Enable cold temperature VDD restriction for HOLI"

parents b7c0ed9c fbc1696d
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@
					<RPM_SMD_REGULATOR_LEVEL_BINNING>;
			qcom,use-voltage-level;
		};

		gfx_cdev: gfx-reg-cdev {
			compatible = "qcom,regulator-cooling-device";
			regulator-cdev-supply = <&VDD_GFX_LEVEL_AO>;
			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
			#cooling-cells = <2>;
		};
	};

	/* PM6350 L1 - VDD_MX supply */
@@ -100,6 +108,14 @@
					<RPM_SMD_REGULATOR_LEVEL_BINNING>;
			qcom,use-voltage-level;
		};

		mx_cdev: mx-cdev-lvl {
			compatible = "qcom,regulator-cooling-device";
			regulator-cdev-supply = <&VDD_MX_LEVEL>;
			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
			#cooling-cells = <2>;
		};
	};

	/* VDD_LPI_CX supply */
@@ -404,6 +420,14 @@
					<RPM_SMD_REGULATOR_LEVEL_BINNING>;
			qcom,use-voltage-level;
		};

		cx_cdev: cx-cdev-lvl {
			compatible = "qcom,regulator-cooling-device";
			regulator-cdev-supply = <&VDD_CX_FLOOR_LEVEL>;
			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
			#cooling-cells = <2>;
		};
	};

	rpm-regulator-smpe8 {
+103 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
				"tsens-critical",
				"tsens-0C";
		tsens-reinit-wa;
		0C-sensor-num = <16>;
		#thermal-sensor-cells = <1>;
	};

@@ -31,6 +32,7 @@
				"tsens-critical",
				"tsens-0C";
		tsens-reinit-wa;
		0C-sensor-num = <16>;
		#thermal-sensor-cells = <1>;
	};

@@ -62,6 +64,13 @@
	};
};

&rpm_bus {
	rpm_smd_cdev: rpm-smd-cdev {
		compatible = "qcom,rpm-smd-cooling-device";
		#cooling-cells = <2>;
	};
};

&cpufreq_hw {
	qcom,cpu-isolation {
		compatible = "qcom,cpu-isolate";
@@ -996,4 +1005,98 @@
			};
		};
	};

	zeroc-0-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 16>;
		thermal-governor = "step_wise";

		trips {
			zeroc_0_trip: active-config0 {
				temperature = <1>;
				hysteresis = <1>;
				type = "passive";
			};
		};

		cooling-maps {
			rpm_smd_cdev {
				trip = <&zeroc_0_trip>;
				cooling-device = <&rpm_smd_cdev 2 2>;
			};

			cx_vdd_cdev {
				trip = <&zeroc_0_trip>;
				cooling-device = <&cx_cdev 1 1>;
			};

			mx_vdd_cdev {
				trip = <&zeroc_0_trip>;
				cooling-device = <&mx_cdev 1 1>;
			};

			gfx_vdd_cdev {
				trip = <&zeroc_0_trip>;
				cooling-device = <&gfx_cdev 1 1>;
			};

			adsp_vdd_cdev {
				trip = <&zeroc_0_trip>;
				cooling-device = <&adsp_vdd 1 1>;
			};

			modem_vdd_cdev {
				trip = <&zeroc_0_trip>;
				cooling-device = <&modem_vdd 1 1>;
			};
		};
	};

	zeroc-1-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 16>;
		thermal-governor = "step_wise";

		trips {
			zeroc_1_trip: active-config0 {
				temperature = <1>;
				hysteresis = <1>;
				type = "passive";
			};
		};

		cooling-maps {
			rpm_smd_cdev {
				trip = <&zeroc_1_trip>;
				cooling-device = <&rpm_smd_cdev 2 2>;
			};

			cx_vdd_cdev {
				trip = <&zeroc_1_trip>;
				cooling-device = <&cx_cdev 1 1>;
			};

			mx_vdd_cdev {
				trip = <&zeroc_1_trip>;
				cooling-device = <&mx_cdev 1 1>;
			};

			gfx_vdd_cdev {
				trip = <&zeroc_1_trip>;
				cooling-device = <&gfx_cdev 1 1>;
			};

			adsp_vdd_cdev {
				trip = <&zeroc_1_trip>;
				cooling-device = <&adsp_vdd 1 1>;
			};

			modem_vdd_cdev {
				trip = <&zeroc_1_trip>;
				cooling-device = <&modem_vdd 1 1>;
			};
		};
	};
};