Merge "ARM: dts: qcom: Enable cpu isolate cooling devices for MSM8917" (7215d79e) · Commits · e / devices / android_kernel_fairphone_FP4

qcom/msm8917-thermal.dtsi

+30 −30

Original line number	Original line	Diff line number	Diff line
	#include <dt-bindings/thermal/thermal.h>		#include <dt-bindings/thermal/thermal.h>

			&clock_cpu {
			qcom,cpu-isolation {
			compatible = "qcom,cpu-isolate";
			cpu0_isolate: cpu0-isolate {
			qcom,cpu = <&CPU0>;
			#cooling-cells = <2>;
			};

			cpu1_isolate: cpu1-isolate {
			qcom,cpu = <&CPU1>;
			#cooling-cells = <2>;
			};

			cpu2_isolate: cpu2-isolate {
			qcom,cpu = <&CPU2>;
			#cooling-cells = <2>;
			};

			cpu3_isolate: cpu3-isolate {
			qcom,cpu = <&CPU3>;
			#cooling-cells = <2>;
			};
			};
			};

	&soc {		&soc {
	qmi-tmd-devices {		qmi-tmd-devices {
	compatible = "qcom,qmi-cooling-devices";		compatible = "qcom,qmi-cooling-devices";
	@@ -188,28 +213,7 @@
	trip = <&cpu_trip>;		trip = <&cpu_trip>;
	cooling-device =		cooling-device =
	<&CPU0 THERMAL_NO_LIMIT		<&CPU0 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;		THERMAL_NO_LIMIT>;
	};

	cpu1_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU1 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};

	cpu2_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU2 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};

	cpu3_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU3 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};		};
	};		};
	};		};
	@@ -254,8 +258,7 @@
	cpu0_cdev {		cpu0_cdev {
	trip = <&apc1_cpu0_trip>;		trip = <&apc1_cpu0_trip>;
	cooling-device =		cooling-device =
	<&CPU0 THERMAL_MAX_LIMIT		<&cpu0_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};
	@@ -277,8 +280,7 @@
	cpu1_cdev {		cpu1_cdev {
	trip = <&apc1_cpu1_trip>;		trip = <&apc1_cpu1_trip>;
	cooling-device =		cooling-device =
	<&CPU1 THERMAL_MAX_LIMIT		<&cpu1_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};
	@@ -300,8 +302,7 @@
	cpu2_cdev {		cpu2_cdev {
	trip = <&apc1_cpu2_trip>;		trip = <&apc1_cpu2_trip>;
	cooling-device =		cooling-device =
	<&CPU2 THERMAL_MAX_LIMIT		<&cpu2_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};
	@@ -323,8 +324,7 @@
	cpu3_cdev {		cpu3_cdev {
	trip = <&apc1_cpu3_trip>;		trip = <&apc1_cpu3_trip>;
	cooling-device =		cooling-device =
	<&CPU3 THERMAL_MAX_LIMIT		<&cpu3_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};

qcom/msm8937-thermal.dtsi

+55 −60

Original line number	Original line	Diff line number	Diff line
	#include <dt-bindings/thermal/thermal.h>		#include <dt-bindings/thermal/thermal.h>

			&clock_cpu {
			qcom,cpu-isolation {
			compatible = "qcom,cpu-isolate";
			cpu0_isolate: cpu0-isolate {
			qcom,cpu = <&CPU0>;
			#cooling-cells = <2>;
			};

			cpu1_isolate: cpu1-isolate {
			qcom,cpu = <&CPU1>;
			#cooling-cells = <2>;
			};

			cpu2_isolate: cpu2-isolate {
			qcom,cpu = <&CPU2>;
			#cooling-cells = <2>;
			};

			cpu3_isolate: cpu3-isolate {
			qcom,cpu = <&CPU3>;
			#cooling-cells = <2>;
			};

			cpu4_isolate: cpu4-isolate {
			qcom,cpu = <&CPU4>;
			#cooling-cells = <2>;
			};

			cpu5_isolate: cpu5-isolate {
			qcom,cpu = <&CPU5>;
			#cooling-cells = <2>;
			};

			cpu6_isolate: cpu6-isolate {
			qcom,cpu = <&CPU6>;
			#cooling-cells = <2>;
			};

			cpu7_isolate: cpu7-isolate {
			qcom,cpu = <&CPU7>;
			#cooling-cells = <2>;
			};
			};
			};

	&soc {		&soc {
	qmi-tmd-devices {		qmi-tmd-devices {
	compatible = "qcom,qmi-cooling-devices";		compatible = "qcom,qmi-cooling-devices";
	@@ -238,56 +283,14 @@
	trip = <&cpu_trip>;		trip = <&cpu_trip>;
	cooling-device =		cooling-device =
	<&CPU0 THERMAL_NO_LIMIT		<&CPU0 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;		THERMAL_NO_LIMIT>;
	};

	cpu1_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU1 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};

	cpu2_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU2 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};

	cpu3_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU3 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};		};

	cpu4_cdev {		cpu4_cdev {
	trip = <&cpu_trip>;		trip = <&cpu_trip>;
	cooling-device =		cooling-device =
	<&CPU4 THERMAL_NO_LIMIT		<&CPU4 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;		THERMAL_NO_LIMIT>;
	};

	cpu5_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU5 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};

	cpu6_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU6 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};

	cpu7_cdev {
	trip = <&cpu_trip>;
	cooling-device =
	<&CPU7 THERMAL_NO_LIMIT
	(THERMAL_MAX_LIMIT-1)>;
	};		};
	};		};
	};		};
	@@ -310,8 +313,7 @@
	cpu0_cdev {		cpu0_cdev {
	trip = <&apc1_cpu0_trip>;		trip = <&apc1_cpu0_trip>;
	cooling-device =		cooling-device =
	<&CPU0 THERMAL_MAX_LIMIT		<&cpu0_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};
	@@ -334,8 +336,7 @@
	cpu1_cdev {		cpu1_cdev {
	trip = <&apc1_cpu1_trip>;		trip = <&apc1_cpu1_trip>;
	cooling-device =		cooling-device =
	<&CPU1 THERMAL_MAX_LIMIT		<&cpu1_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};
	@@ -358,8 +359,7 @@
	cpu2_cdev {		cpu2_cdev {
	trip = <&apc1_cpu2_trip>;		trip = <&apc1_cpu2_trip>;
	cooling-device =		cooling-device =
	<&CPU2 THERMAL_MAX_LIMIT		<&cpu2_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};
	@@ -382,8 +382,7 @@
	cpu3_cdev {		cpu3_cdev {
	trip = <&apc1_cpu3_trip>;		trip = <&apc1_cpu3_trip>;
	cooling-device =		cooling-device =
	<&CPU3 THERMAL_MAX_LIMIT		<&cpu3_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};
	@@ -406,29 +405,25 @@
	cpu4_cdev {		cpu4_cdev {
	trip = <&cpuss0_step_trip>;		trip = <&cpuss0_step_trip>;
	cooling-device =		cooling-device =
	<&CPU4 THERMAL_MAX_LIMIT		<&cpu4_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};

	cpu5_cdev {		cpu5_cdev {
	trip = <&cpuss0_step_trip>;		trip = <&cpuss0_step_trip>;
	cooling-device =		cooling-device =
	<&CPU5 THERMAL_MAX_LIMIT		<&cpu5_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};

	cpu6_cdev {		cpu6_cdev {
	trip = <&cpuss0_step_trip>;		trip = <&cpuss0_step_trip>;
	cooling-device =		cooling-device =
	<&CPU6 THERMAL_MAX_LIMIT		<&cpu6_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};

	cpu7_cdev {		cpu7_cdev {
	trip = <&cpuss0_step_trip>;		trip = <&cpuss0_step_trip>;
	cooling-device =		cooling-device =
	<&CPU7 THERMAL_MAX_LIMIT		<&cpu7_isolate 1 1>;
	THERMAL_MAX_LIMIT>;
	};		};
	};		};
	};		};