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

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

Merge "ARM: dts: qcom: Add thermal configuration for SCUBA"

parents 12c708e2 ef5ca3b0

qcom/scuba-regulator.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -49,6 +49,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_NOM

					RPM_SMD_REGULATOR_LEVEL_NONE>;

			#cooling-cells = <2>;

		};

	};



	/* PM2250 L1 - VDD_MX/WCSS_MX supply */
@@ -94,6 +102,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_NOM

					RPM_SMD_REGULATOR_LEVEL_NONE>;

			#cooling-cells = <2>;

		};

	};



	rpm-regulator-smpa3 {

qcom/scuba-stub-regulator.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,14 @@ 
		regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

	};



	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>;

		#cooling-cells = <2>;

	};



	VDD_MX_LEVEL:

	L1A_LEVEL: pm2250_l1_level: regulator-pm2250-l1-level {

		compatible = "qcom,stub-regulator";
@@ -37,6 +45,14 @@ 
		regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

	};



	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>;

		#cooling-cells = <2>;

	};



	S4A: pm2250_s4: regulator-pm2250-s4 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm2250_s4";

qcom/scuba-thermal.dtsi

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

#include <dt-bindings/thermal/qmi_thermal.h>



&soc {

	qmi-tmd-devices {

		compatible = "qcom,qmi-cooling-devices";



		modem {

			qcom,instance-id = <QMI_MODEM_INST_ID>;



			modem_pa: modem_pa {

				qcom,qmi-dev-name = "pa";

				#cooling-cells = <2>;

			};



			modem_proc: modem_proc {

				qcom,qmi-dev-name = "modem";

				#cooling-cells = <2>;

			};



			modem_current: modem_current {

				qcom,qmi-dev-name = "modem_current";

				#cooling-cells = <2>;

			};



			modem_skin: modem_skin {

				qcom,qmi-dev-name = "modem_skin";

				#cooling-cells = <2>;

			};



			modem_vdd: modem_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};



			modem_wlan: modem_wlan {

				qcom,qmi-dev-name = "wlan";

				#cooling-cells = <2>;

			};

		};



		adsp {

			qcom,instance-id = <QMI_ADSP_INST_ID>;



			adsp_vdd: adsp_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};

		};

	};



	lmh_cpu_vdd: qcom,lmh-cpu-vdd@f550800 {

		compatible = "qcom,lmh-cpu-vdd";

		reg =  <0xf550800 0x1000>;

		#cooling-cells = <2>;

	};

};



&thermal_zones {

	mapss-usr {
@@ -43,7 +99,7 @@ 
		};

	};



	camera-usr {

	wlan-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";
@@ -190,6 +246,27 @@ 
		};

	};



	camera-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 9>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};



			reset-mon-cfg {

				temperature = <115000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

	};



	xo-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;
@@ -279,5 +356,187 @@ 
			};

		};

	};



	gpu-step {

		polling-delay-passive = <10>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&tsens0 7>;

		wake-capable-sensor;

		trips {

			gpu_step_trip: gpu-trip {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};



			gpu_cx_mon: gpu-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};



		};



		cooling-maps {

			gpu-cx-cdev1 {

				trip = <&gpu_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};



			gpu-cx-cdev2 {

				trip = <&gpu_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

		};

	};



	cpuss-0-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&tsens0 3>;

		wake-capable-sensor;



		trips {

			cpu0_2_config: cpu-0-2-config {

				temperature = <110000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};

	};



	cpuss-1-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&tsens0 4>;

		wake-capable-sensor;



		trips {

			cpu1_3_config: cpu-1-3-config {

				temperature = <110000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};

	};



	mdm-0-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&tsens0 5>;

		wake-capable-sensor;

		trips {

			mdm0_cx_mon: mdm0-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			mdm0-cx-cdev1 {

				trip = <&mdm0_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};



			mdm0-cx-cdev2 {

				trip = <&mdm0_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

		};

	};



	mdm-1-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&tsens0 6>;

		wake-capable-sensor;

		trips {

			mdm1_cx_mon: mdm1-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			mdm1-cx-cdev1 {

				trip = <&mdm1_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};



			mdm1-cx-cdev2 {

				trip = <&mdm1_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

		};

	};



	mapss-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 0>;

		wake-capable-sensor;

		tracks-low;



		trips {

			mapss_trip: mapss-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			cx_vdd_cdev {

				trip = <&mapss_trip>;

				cooling-device = <&cx_cdev 0 0>;

			};



			mx_vdd_cdev {

				trip = <&mapss_trip>;

				cooling-device = <&mx_cdev 0 0>;

			};



			modem_vdd_cdev {

				trip = <&mapss_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};



			adsp_vdd_cdev {

				trip = <&mapss_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

		};

	};



	mapss-lowc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&tsens0 0>;

		wake-capable-sensor;

		tracks-low;



		trips {

			mapss_cap_trip: mapss-cap-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			lmh_cpu_cdev {

				trip = <&mapss_cap_trip>;

				cooling-device = <&lmh_cpu_vdd 1 1>;

			};

		};

	};

};