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

Commit 890b01f5 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 GPU thermal config for SM8150" into msm-4.14

parents 7777fa80 c493aef0
Loading
Loading
Loading
Loading
+147 −0
Original line number Diff line number Diff line
@@ -547,6 +547,11 @@
				trip = <&aoss0_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&aoss0_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -604,6 +609,11 @@
				trip = <&cpu00_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu00_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -661,6 +671,11 @@
				trip = <&cpu01_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu01_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -718,6 +733,11 @@
				trip = <&cpu02_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu02_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -775,6 +795,11 @@
				trip = <&cpu03_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu03_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -832,6 +857,11 @@
				trip = <&cpuss0_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpuss0_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -889,6 +919,11 @@
				trip = <&cpuss1_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpuss1_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -946,6 +981,11 @@
				trip = <&cpu10_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu10_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1003,6 +1043,11 @@
				trip = <&cpu11_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu11_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1060,6 +1105,11 @@
				trip = <&cpu12_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu12_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1117,6 +1167,11 @@
				trip = <&cpu13_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu13_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1174,6 +1229,11 @@
				trip = <&cpu14_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu14_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1231,6 +1291,11 @@
				trip = <&cpu15_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu15_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1288,6 +1353,11 @@
				trip = <&cpu16_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu16_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1345,6 +1415,11 @@
				trip = <&cpu17_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cpu17_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1402,6 +1477,11 @@
				trip = <&gpuss0_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&gpuss0_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1459,6 +1539,11 @@
				trip = <&aoss1_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&aoss1_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1516,6 +1601,11 @@
				trip = <&cwlan_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cwlan_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1573,6 +1663,11 @@
				trip = <&video_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&video_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1630,6 +1725,11 @@
				trip = <&ddr_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&ddr_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1687,6 +1787,11 @@
				trip = <&q6_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&q6_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1744,6 +1849,11 @@
				trip = <&camera_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&camera_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1801,6 +1911,11 @@
				trip = <&cmpss_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&cmpss_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1858,6 +1973,11 @@
				trip = <&mdm_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&mdm_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1915,6 +2035,11 @@
				trip = <&npu_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&npu_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -1972,6 +2097,11 @@
				trip = <&mdmv_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&mdmv_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -2029,6 +2159,11 @@
				trip = <&mdms_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&mdms_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -2086,6 +2221,11 @@
				trip = <&gpuss1_trip>;
				cooling-device = <&slpi_vdd 0 0>;
			};
			gpu_vdd_cdev {
				trip = <&gpuss1_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-2)
							(THERMAL_MAX_LIMIT-2)>;
			};
		};
	};

@@ -2100,6 +2240,13 @@
				type = "passive";
			};
		};
		cooling-maps {
			gpu_cdev {
				trip = <&gpu_trip0>;
				cooling-device = <&msm_gpu THERMAL_NO_LIMIT
							THERMAL_NO_LIMIT>;
			};
		};
	};

	apc-0-max-step {