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

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

Merge "ARM: dts: qcom: Update cx and mx cooling device node for SCUBA"

parents 5d684e10 28a198a3
Loading
Loading
Loading
Loading
+52 −0
Original line number Diff line number Diff line
@@ -301,5 +301,57 @@
				qcom,default-led-trigger = "switch0_trigger";
			};
		};

		bcl_soc: bcl-soc {
			compatible = "qcom,msm-bcl-soc";
			#thermal-sensor-cells = <0>;
		};
	};
};

&thermal_zones {
	pm2250-tz {
		polling-delay-passive = <100>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&pm2250_tz>;
		wake-capable-sensor;

		trips {
			pm2250_trip0: trip0 {
				temperature = <95000>;
				hysteresis = <0>;
				type = "passive";
			};

			pm2250_trip1: trip1 {
				temperature = <115000>;
				hysteresis = <0>;
				type = "passive";
			};

			trip2 {
				temperature = <145000>;
				hysteresis = <0>;
				type = "passive";
			};
		};
	};

	soc {
		polling-delay-passive = <100>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&bcl_soc>;
		wake-capable-sensor;
		tracks-low;

		trips {
			pm2250_low_soc: low-soc {
				temperature = <10>;
				hysteresis = <0>;
				type = "passive";
			};
		};
	};
};
+1 −0
Original line number Diff line number Diff line
#include "scuba-audio-overlay.dtsi"
#include "scuba-thermal-overlay.dtsi"

&soc {
	scuba_batterydata: qcom,battery-data {
+2 −0
Original line number Diff line number Diff line
#include "scuba-thermal-overlay.dtsi"

&soc {
	scuba_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
+4 −4
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@
	cx_cdev: cx-cdev-lvl {
		compatible = "qcom,regulator-cooling-device";
		regulator-cdev-supply = <&VDD_CX_LEVEL_AO>;
		regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM
				RPM_SMD_REGULATOR_LEVEL_NONE>;
		regulator-levels = <RPMH_REGULATOR_LEVEL_NOM
				RPMH_REGULATOR_LEVEL_RETENTION>;
		#cooling-cells = <2>;
	};

@@ -48,8 +48,8 @@
	mx_cdev: mx-cdev-lvl {
		compatible = "qcom,regulator-cooling-device";
		regulator-cdev-supply = <&VDD_MX_LEVEL>;
		regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM
				RPM_SMD_REGULATOR_LEVEL_NONE>;
		regulator-levels = <RPMH_REGULATOR_LEVEL_NOM
				RPMH_REGULATOR_LEVEL_RETENTION>;
		#cooling-cells = <2>;
	};

+50 −0
Original line number Diff line number Diff line
#include <dt-bindings/thermal/thermal.h>

&thermal_zones {
	pm2250-tz {
		cooling-maps {
			trip0_cpu0 {
				trip = <&pm2250_trip0>;
				cooling-device =
					<&CPU0 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip1_cpu1 {
				trip = <&pm2250_trip1>;
				cooling-device = <&cpu1_isolate 1 1>;
			};

			trip1_cpu2 {
				trip = <&pm2250_trip1>;
				cooling-device = <&cpu2_isolate 1 1>;
			};

			trip1_cpu3 {
				trip = <&pm2250_trip1>;
				cooling-device = <&cpu3_isolate 1 1>;
			};
		};
	};

	soc {
		cooling-maps {
			soc_cpu0 {
				trip = <&pm2250_low_soc>;
				cooling-device =
					<&CPU0 (THERMAL_MAX_LIMIT-4)
						(THERMAL_MAX_LIMIT-4)>;
			};

			soc_cpu2 {
				trip = <&pm2250_low_soc>;
				cooling-device = <&cpu2_isolate 1 1>;
			};

			soc_cpu3 {
				trip = <&pm2250_low_soc>;
				cooling-device = <&cpu3_isolate 1 1>;
			};
		};
	};
};