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

Commit 5eaf11c9 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 default thermal zone rules for MSM8937/SDM439"

parents 9dbb858b aeb6bc77

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

+8 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L2_1: l2-cache {

			      compatible = "arm,arch-cache";

			      cache-level = <2>;
@@ -84,6 +85,7 @@ 
			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_101: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;
@@ -102,6 +104,7 @@ 
			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_102: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;
@@ -120,6 +123,7 @@ 
			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_103: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;
@@ -138,6 +142,7 @@ 
			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L2_0: l2-cache {

			      compatible = "arm,arch-cache";

			      cache-level = <2>;
@@ -161,6 +166,7 @@ 
			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L1_I_1: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;
@@ -179,6 +185,7 @@ 
			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L1_I_2: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;
@@ -197,6 +204,7 @@ 
			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L1_I_3: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;

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

+543 −0
Original line number Diff line number Diff line
@@ -196,4 +196,547 @@ 
			};

		};

	};



	gpu-step {

		polling-delay-passive = <250>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 10>;

		thermal-governor = "step_wise";

		trips {

			gpu_step_trip: gpu-step-trip {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

		};

		cooling-maps {

			gpu_cdev0 {

				trip = <&gpu_step_trip>;

				cooling-device =

					<&msm_gpu THERMAL_NO_LIMIT

						THERMAL_NO_LIMIT>;

			};

		};

	};



	hexa-cpu-max-step {

		polling-delay-passive = <50>;

		polling-delay = <100>;

		thermal-governor = "step_wise";

		trips {

			cpu_trip:cpu-trip {

				temperature = <85000>;

				hysteresis = <0>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_cdev {

				trip = <&cpu_trip>;

				cooling-device =

					<&CPU0 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-1)>;

			};

			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 {

				trip = <&cpu_trip>;

				cooling-device =

					<&CPU4 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-1)>;

			};

			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)>;

			};

		};

	};



	apc1-cpu0-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 5>;

		thermal-governor = "step_wise";

		trips {

			apc1_cpu0_trip: apc1-cpu0-trip {

				temperature = <105000>;

				hysteresis = <15000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_cdev {

				trip = <&apc1_cpu0_trip>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	apc1-cpu1-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 6>;

		thermal-governor = "step_wise";

		trips {

			apc1_cpu1_trip: apc1-cpu1-trip {

				temperature = <105000>;

				hysteresis = <15000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu1_cdev {

				trip = <&apc1_cpu1_trip>;

				cooling-device =

					<&CPU1 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	apc1-cpu2-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 7>;

		thermal-governor = "step_wise";

		trips {

			apc1_cpu2_trip: apc1-cpu2-trip {

				temperature = <105000>;

				hysteresis = <15000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu2_cdev {

				trip = <&apc1_cpu2_trip>;

				cooling-device =

					<&CPU2 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	apc1-cpu3-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 8>;

		thermal-governor = "step_wise";

		trips {

			apc1_cpu3_trip: apc1-cpu3-trip {

				temperature = <105000>;

				hysteresis = <15000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu3_cdev {

				trip = <&apc1_cpu3_trip>;

				cooling-device =

					<&CPU3 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	cpuss0-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 9>;

		thermal-governor = "step_wise";

		trips {

			cpuss0_step_trip: cpuss0-step-trip {

				temperature = <105000>;

				hysteresis = <15000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu4_cdev {

				trip = <&cpuss0_step_trip>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu5_cdev {

				trip = <&cpuss0_step_trip>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu6_cdev {

				trip = <&cpuss0_step_trip>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu7_cdev {

				trip = <&cpuss0_step_trip>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	aoss0-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 0>;

		tracks-low;

		trips {

			aoss0_trip: aoss-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&aoss0_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&aoss0_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&aoss0_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	mdm-core-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 1>;

		tracks-low;

		trips {

			mdm_core_trip: mdm-core-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&mdm_core_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&mdm_core_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&mdm_core_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	lpass-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 2>;

		tracks-low;

		trips {

			qdsp_trip: qdsp-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&qdsp_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&qdsp_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&qdsp_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	camera-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 3>;

		tracks-low;

		trips {

			camera_trip: camera-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&camera_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	cpuss1-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 4>;

		tracks-low;

		trips {

			cpuss1_trip: cpuss1-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpuss1_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&cpuss1_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpuss1_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	apc1-cpu0-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 5>;

		tracks-low;

		trips {

			cpu0_trip: apc1-cpu0-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu0_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	apc1-cpu1-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 6>;

		tracks-low;

		trips {

			cpu1_trip: apc1-cpu1-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu1_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	apc1-cpu2-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 7>;

		tracks-low;

		trips {

			cpu2_trip: apc1-cpu2-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu2_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	apc1-cpu3-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 8>;

		tracks-low;

		trips {

			cpu3_trip: apc1-cpu3-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu3_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	cpuss0-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 9>;

		tracks-low;

		trips {

			cpuss0_lowf_trip: cpuss0-lowf-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpuss0_lowf_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&cpuss0_lowf_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpuss0_lowf_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	gpu-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 10>;

		tracks-low;

		trips {

			gpu_lowf_trip: gpu-lowf-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&gpu_lowf_trip>;

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

						(THERMAL_MAX_LIMIT-2)>;

			};

			cx_vdd_cdev {

				trip = <&gpu_lowf_trip>;

				cooling-device = <&pm8937_cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&gpu_lowf_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm429-cpu.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L2_1: l2-cache {

			      compatible = "arm,arch-cache";

			      cache-level = <2>;
@@ -68,6 +69,7 @@ 
			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_101: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;
@@ -85,6 +87,7 @@ 
			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_102: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;
@@ -102,6 +105,7 @@ 
			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_103: l1-icache {

				compatible = "arm,arch-cache";

				qcom,dump-size = <0x8800>;

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

+13 −0
Original line number Diff line number Diff line
@@ -40,3 +40,16 @@ 
		/delete-node/ port@4;

	};

};



&thermal_zones {

	hexa-cpu-max-step {

		cooling-maps {

			/delete-node/ cpu4_cdev;

			/delete-node/ cpu5_cdev;

			/delete-node/ cpu6_cdev;

			/delete-node/ cpu7_cdev;

		};

	};



	/delete-node/ cpuss0-step;

};

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

+81 −0
Original line number Diff line number Diff line
@@ -175,3 +175,84 @@ 
#include "pm8953.dtsi"

#include "pm8953-rpm-regulator.dtsi"

#include "sdm439-regulator.dtsi"



&thermal_zones {

	aoss0-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};



	mdm-core-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	lpass-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	camera-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	cpuss1-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	apc1-cpu0-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	apc1-cpu1-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	apc1-cpu2-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	apc1-cpu3-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	cpuss0-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

	gpu-lowf {

		cooling-maps {

			cx_vdd_cdev {

				cooling-device = <&pm8953_cx_cdev 0 0>;

			};

		};

	};

};