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

Commit b7d35909 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: Update gpu cooling device vdd restriction vote for sdm670"

parents 9d664647 c7624070

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

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

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



		/* Enable gpu cooling device */

		#cooling-cells = <2>;



		/* GPU Mempools */

		qcom,gpu-mempools {

			#address-cells= <1>;

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

+68 −0
Original line number Diff line number Diff line
@@ -265,6 +265,14 @@ 
				type = "passive";

			};

		};

		cooling-maps {

			gpu_cdev0 {

				trip = <&gpu_trip0>;

				cooling-device =

					<&msm_gpu THERMAL_NO_LIMIT

						THERMAL_NO_LIMIT>;

			};

		};

	};



	deca-cpu-max-step {
@@ -589,6 +597,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&mdm_core_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&mdm_core_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -619,6 +631,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&qdsp_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&qdsp_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -649,6 +665,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -679,6 +699,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu4_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu4_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -709,6 +733,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu5_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu5_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -739,6 +767,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu6_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu6_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -769,6 +801,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu7_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu7_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -799,6 +835,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&apc1_l2_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&apc1_l2_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -829,6 +869,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -859,6 +903,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -889,6 +937,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -919,6 +971,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -949,6 +1005,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&apc0_l2_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&apc0_l2_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -979,6 +1039,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&gpu0_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&gpu0_trip>;

				cooling-device = <&cx_cdev 0 0>;
@@ -1009,6 +1073,10 @@ 
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT - 4)

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&gpu1_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&gpu1_trip>;

				cooling-device = <&cx_cdev 0 0>;

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

+14 −964

File changed.

Preview size limit exceeded, changes collapsed.