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

Commit be30befd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add cooling device property to MSM8937 msm gpu"

parents e4b29b29 955992dc

arch/arm64/boot/dts/qcom/msm8937-gpu.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ 
		/* Context aware jump target power level */

		qcom,ca-target-pwrlevel = <1>;



		/* Enable gpu cooling device */

		#cooling-cells = <2>;



		/* GPU Mempools */

		qcom,gpu-mempools {

			#address-cells= <1>;

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

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2018, 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
@@ -58,6 +58,14 @@ 
				<RPM_SMD_REGULATOR_LEVEL_BINNING>;

			qcom,use-voltage-level;

		};



		pm8937_cx_cdev: regulator-cx-cdev {

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

			regulator-cdev-supply = <&pm8937_s2_floor_level>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM

					RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			#cooling-cells = <2>;

		};

	};



	rpm-regulator-smpa3 {

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

0 → 100644
+199 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



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



&soc {

	qmi-tmd-devices {

		compatible = "qcom,qmi_cooling_devices";



		modem {

			qcom,instance-id = <0x0>;



			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_vdd: modem_vdd {

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

				#cooling-cells = <2>;

			};

		};

	};

};



&thermal_zones {

	aoss0-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 0>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	mdm-core-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 1>;

		trips {

			active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

			};

		};

	};



	lpass-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	camera-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 3>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	cpuss1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 4>;

		thermal-governor = "user_space";

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	apc1-cpu0-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 5>;

		thermal-governor = "user_space";

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	apc1-cpu1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 6>;

		thermal-governor = "user_space";

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	apc1-cpu2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 7>;

		thermal-governor = "user_space";

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	apc1-cpu3-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 8>;

		thermal-governor = "user_space";

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	cpuss0-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 9>;

		thermal-governor = "user_space";

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	gpu-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 10>;

		thermal-governor = "user_space";

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

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

+2 −155
Original line number Diff line number Diff line
@@ -303,161 +303,7 @@ 
		qcom,pipe-attr-ee;

	};



	thermal_zones: thermal-zones {

		aoss0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 0>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		mdm-core-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 1>;

			trips {

				active-config0 {

						temperature = <125000>;

						hysteresis = <1000>;

						type = "passive";

				};

			};

		};



		mdss-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 2>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		camera-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";

			thermal-sensors = <&tsens0 3>;

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		cpuss-0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 4>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		apc1_cpu1-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 5>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		apc1_cpu2-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 6>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		apc1_cpu3-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 7>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		apc1_cpu4-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 8>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		apc0_cpu0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 9>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		gpu0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 10>;

			thermal-governor = "user_space";

			trips {

				active-config0 {

					temperature = <125000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};

	};

	thermal_zones: thermal-zones {};



	tsens0: tsens@4a8000 {

		compatible = "qcom,msm8937-tsens";
@@ -1816,6 +1662,7 @@ 
#include "msm8937-audio.dtsi"

#include "msm-gdsc-8916.dtsi"

#include "msm8937-coresight.dtsi"

#include "msm8937-thermal.dtsi"



&gdsc_venus {

	clock-names = "bus_clk", "core_clk";

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

+8 −0
Original line number Diff line number Diff line
@@ -63,6 +63,14 @@ 
					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,use-voltage-level;

		};



		pm8953_cx_cdev: regulator-cx-cdev {

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

			regulator-cdev-supply = <&pm8953_s2_floor_level>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM

					RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			#cooling-cells = <2>;

		};

	};



	rpm-regulator-smpa3 {