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

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

Merge "ARM: dts: msm: Add default thermal zone rules for MDM9607"

parents f2ebc2eb ed6e35a4

arch/arm64/boot/dts/qcom/mdm9607-regulator.dtsi

+17 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -70,6 +70,14 @@ 
					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,use-voltage-level;

		};



		cx_cdev: cx {

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&mdm9607_s3_floor_level>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM_PLUS

					RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			#cooling-cells = <2>;

		};

	};



	rpm-regulator-smpa4 {
@@ -264,6 +272,14 @@ 
			qcom,use-voltage-floor-level;

			qcom,always-send-voltage;

		};



		mx_cdev: mx {

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&mdm9607_l12_floor_level>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM_PLUS

					RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			#cooling-cells = <2>;

		};

	};



	rpm-regulator-ldoa13 {

arch/arm64/boot/dts/qcom/mdm9607-thermal.dtsi

+261 −0
Original line number Diff line number Diff line
@@ -142,4 +142,265 @@ 
			};

		};

	};



	cpuss-step {

		polling-delay-passive = <65>;

		polling-delay = <0>;

		thermal-sensors = <&tsens 4>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			cpu_trip:cpu-trip  {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

		};



		cooling-maps {

			cpu0_cdev {

				trip = <&cpu_trip>;

				cooling-device =

					<&CPU0 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-1)>;

			};

		};

	};



	modem-dsp-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens 2>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			modem_pa_trip0: modem_pa_trip0 {

				temperature = <95000>;

				hysteresis = <5000>;

				type = "passive";

			};

			modem_pa_trip1: modem_pa_trip1 {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

			modem_cx_trip0: modem-cx-trip0  {

				temperature = <110000>;

				hysteresis = <5000>;

				type = "passive";

			};

			modem_cx_trip1: modem-cx-trip1 {

				temperature = <112000>;

				hysteresis = <2000>;

				type = "passive";

			};

			modem_cx_trip2: modem-cx-trip2 {

				temperature = <115000>;

				hysteresis = <3000>;

				type = "passive";

			};

		};



		cooling-maps {

			modem_pa0_cdev {

				trip = <&modem_pa_trip0>;

				cooling-device = <&modem_pa 1 1>;

			};



			modem_pa1_cdev {

				trip = <&modem_pa_trip1>;

				cooling-device = <&modem_pa 2 2>;

			};



			modem_cx0_cdev {

				trip = <&modem_cx_trip0>;

				cooling-device = <&modem_cx 0 0>;

			};



			modem_cx1_cdev {

				trip = <&modem_cx_trip1>;

				cooling-device = <&modem_cx 1 1>;

			};



			modem_cx2_cdev {

				trip = <&modem_cx_trip2>;

				cooling-device = <&modem_cx 2 2>;

			};

		};

	};



	nav-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens 0>;

		wake-capable-sensor;

		trips {

			nav_lowf: nav-lowf {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			cpu0_cdev {

				trip = <&nav_lowf>;

				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-3)

							(THERMAL_MAX_LIMIT-3)>;

			};

			cx_vdd_cdev {

				trip = <&nav_lowf>;

				cooling-device = <&cx_cdev 0 0>;

			};

			mx_vdd_cdev {

				trip = <&nav_lowf>;

				cooling-device = <&mx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&nav_lowf>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	wddac-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens 1>;

		wake-capable-sensor;

		trips {

			wddac_lowf: wddac-lowf {

				temperature = <5000>;

				hysteresis = <5000>;

				type ="passive";

			};

		};



		cooling-maps {

			cpu0_cdev {

				trip = <&wddac_lowf>;

				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-3)

							(THERMAL_MAX_LIMIT-3)>;

			};

			cx_vdd_cdev {

				trip = <&wddac_lowf>;

				cooling-device = <&cx_cdev 0 0>;

			};

			mx_vdd_cdev {

				trip = <&wddac_lowf>;

				cooling-device = <&mx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&wddac_lowf>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	modem-dsp-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens 2>;

		wake-capable-sensor;

		trips {

			modem_dsp_lowf: modem-dsp-lowf {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			cpu0_cdev {

				trip = <&modem_dsp_lowf>;

				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-3)

							(THERMAL_MAX_LIMIT-3)>;

			};

			cx_vdd_cdev {

				trip = <&modem_dsp_lowf>;

				cooling-device = <&cx_cdev 0 0>;

			};

			mx_vdd_cdev {

				trip = <&modem_dsp_lowf>;

				cooling-device = <&mx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&modem_dsp_lowf>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	ipss-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens 3>;

		wake-capable-sensor;

		trips {

			ipss_lowf: ipss-lowf {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			cpu0_cdev {

				trip = <&ipss_lowf>;

				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-3)

							(THERMAL_MAX_LIMIT-3)>;

			};

			cx_vdd_cdev {

				trip = <&ipss_lowf>;

				cooling-device = <&cx_cdev 0 0>;

			};

			mx_vdd_cdev {

				trip = <&ipss_lowf>;

				cooling-device = <&mx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&ipss_lowf>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	cpuss-lowf {

		polling-delay-passive = <65>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens 4>;

		wake-capable-sensor;

		trips {

			cpuss_lowf: cpuss-lowf {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};



		cooling-maps {

			cpu0_cdev {

				trip = <&cpuss_lowf>;

				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-3)

							(THERMAL_MAX_LIMIT-3)>;

			};

			cx_vdd_cdev {

				trip = <&cpuss_lowf>;

				cooling-device = <&cx_cdev 0 0>;

			};

			mx_vdd_cdev {

				trip = <&cpuss_lowf>;

				cooling-device = <&mx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpuss_lowf>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/mdm9607.dtsi

+1 −94
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x0>;

			qcom,limits-info = <&mitigation_profile0>;

			#cooling-cells = <2>;

		};

	};

	soc: soc { };
@@ -1238,99 +1238,6 @@ 
				&pri_mi2s_din_sleep>;

	};



	qcom,msm-thermal {

		compatible = "qcom,msm-thermal";

		qcom,sensor-id = <4>;

		qcom,poll-ms = <250>;

		qcom,limit-temp = <60>;

		qcom,temp-hysteresis = <10>;

		qcom,freq-step = <2>;

		qcom,freq-mitigation-temp = <105>;

		qcom,freq-mitigation-temp-hysteresis = <15>;

		qcom,freq-mitigation-value = <800000>;

		qcom,disable-cx-phase-ctrl;

		qcom,disable-gfx-phase-ctrl;

		qcom,disable-psm;

		qcom,disable-ocr;

		qcom,mx-restriction-temp = <10>;

		qcom,mx-restriction-temp-hysteresis = <5>;

		qcom,mx-retention-min =

			<RPM_SMD_REGULATOR_LEVEL_NOM_PLUS>;

		vdd-mx-supply = <&mdm9607_l12_floor_level>;

		qcom,vdd-restriction-temp = <5>;

		qcom,vdd-restriction-temp-hysteresis = <10>;

		vdd-dig-supply = <&mdm9607_s3_floor_level>;

		qcom,therm-ddr-lm-info = <2 78 70>;



		qcom,vdd-dig-rstr{

			qcom,vdd-rstr-reg = "vdd-dig";

			qcom,levels = <RPM_SMD_REGULATOR_LEVEL_NOM_PLUS

					RPM_SMD_REGULATOR_LEVEL_TURBO

					RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,min-level = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		};



		 msm_thermal_freq: qcom,vdd-apps-rstr {

			qcom,vdd-rstr-reg = "vdd-apps";

			qcom,levels = <998400>;

			qcom,freq-req;

		};

	};



	qcom,sensor-information {

		compatible = "qcom,sensor-information";

		sensor_information0: qcom,sensor-information-0 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor0";

		};



		sensor_information1: qcom,sensor-information-1 {

			qcom,sensor-type =  "tsens";

			qcom,sensor-name = "tsens_tz_sensor1";

		};



		sensor_information2: qcom,sensor-information-2 {

			qcom,sensor-type =  "tsens";

			qcom,sensor-name = "tsens_tz_sensor2";

		};



		sensor_information3: qcom,sensor-information-3 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor3";

		};



		sensor_information4: qcom,sensor-information-4 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor4";

		};



		sensor_information5: qcom,sensor-information-5 {

			qcom,sensor-type = "adc";

			qcom,sensor-name = "pa_therm0";

		};



		sensor_information6: qcom,sensor-information-6 {

			qcom,sensor-type = "adc";

			qcom,sensor-name = "pa_therm1";

		};



		sensor_information7: qcom,sensor-information-7 {

			qcom,sensor-type = "adc";

			qcom,sensor-name = "xo_therm";

		};



		sensor_information8: qcom,sensor-information-8 {

			qcom,sensor-type = "adc";

			qcom,sensor-name = "xo_therm_amux";

		};

	};



	mitigation_profile0: qcom,limit_info-0 {

		qcom,temperature-sensor = <&sensor_information4>;

		qcom,boot-frequency-mitigate;

		qcom,emergency-frequency-mitigate;

	};



	qcom,ipc-spinlock@1905000 {

		compatible = "qcom,ipc-spinlock-sfpb";

		reg = <0x1905000 0x8000>;