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

Commit 5c1d6809 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 TSENS mappings for thermal zones for SDM632"

parents 840acd9f ba19d5b1

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

+315 −23
Original line number Diff line number Diff line
@@ -52,12 +52,20 @@ 
	/delete-node/ gpu1-usr;

	/delete-node/ gpu1-step;

	/delete-node/ deca-cpu-max-step;

	/delete-node/ apc1-cpu0-step;

	/delete-node/ apc1-cpu1-step;

	/delete-node/ apc1-cpu2-step;

	/delete-node/ apc1-cpu3-step;

	/delete-node/ apc0-cpu0-step;

	/delete-node/ apc0-cpu1-step;

	/delete-node/ apc0-cpu2-step;

	/delete-node/ apc0-cpu3-step;

	/delete-node/ camera-lowf;

	/delete-node/ apc1-l2-lowf;

	/delete-node/ apc1-cpu0-lowf;

	/delete-node/ apc1-cpu1-lowf;

	/delete-node/ apc1-cpu2-lowf;

	/delete-node/ apc1-cpu3-lowf;

	/delete-node/ apc0-cpu0-lowf;

	/delete-node/ apc0-cpu1-lowf;

	/delete-node/ apc0-cpu2-lowf;
@@ -65,6 +73,10 @@ 
	/delete-node/ apc0-l2-lowf;

	/delete-node/ gpu0-lowf;

	/delete-node/ gpu1-lowf;

	/delete-node/ apc1-cpu0-usr;

	/delete-node/ apc1-cpu1-usr;

	/delete-node/ apc1-cpu2-usr;

	/delete-node/ apc1-cpu3-usr;



	case-therm-step {

		status = "disabled";
@@ -84,7 +96,63 @@ 
		};

	};



	cpuss0-usr {

	apc1-mhm-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>;
@@ -98,7 +166,7 @@ 
		};

	};



	cpuss1-usr {

	apc1-l2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 9>;
@@ -112,7 +180,7 @@ 
		};

	};



	cpuss3-usr {

	cpuss0-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 13>;
@@ -242,14 +310,102 @@ 
		};

	};



	cpuss3-step {

	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 {

			cpu4_cdev {

				trip = <&apc1_cpu0_trip>;

				cooling-device =

					<&CPU4 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 {

			cpu5_cdev {

				trip = <&apc1_cpu1_trip>;

				cooling-device =

					<&CPU5 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 {

			cpu6_cdev {

				trip = <&apc1_cpu2_trip>;

				cooling-device =

					<&CPU6 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 {

			cpu7_cdev {

				trip = <&apc1_cpu3_trip>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	cpuss0-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 13>;

		thermal-governor = "step_wise";



		trips {

			cpuss3_trip: cpuss3-trip {

			cpuss0_trip: cpuss0-trip {

				temperature = <105000>;

				hysteresis = <15000>;

				type = "passive";
@@ -257,25 +413,25 @@ 
		};

		cooling-maps {

			cpu0_cdev {

				trip = <&cpuss3_trip>;

				trip = <&cpuss0_trip>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu1_cdev {

				trip = <&cpuss3_trip>;

				trip = <&cpuss0_trip>;

				cooling-device =

					<&CPU1 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu2_cdev {

				trip = <&cpuss3_trip>;

				trip = <&cpuss0_trip>;

				cooling-device =

					<&CPU2 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu3_cdev {

				trip = <&cpuss3_trip>;

				trip = <&cpuss0_trip>;

				cooling-device =

					<&CPU3 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;
@@ -318,15 +474,15 @@ 
		};

	};



	cpuss0-lowf {

	apc1-mhm-low {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 8>;

		thermal-sensors = <&tsens0 4>;

		tracks-low;



		trips {

			sdm632_cpuss0_trip: cpuss0-trip {

			sdm632_cpuss1_trip: cpuss1-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";
@@ -334,26 +490,162 @@ 
		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&sdm632_cpuss0_trip>;

				trip = <&sdm632_cpuss1_trip>;

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

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&sdm632_cpuss0_trip>;

				trip = <&sdm632_cpuss1_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&sdm632_cpuss0_trip>;

				trip = <&sdm632_cpuss1_trip>;

				cooling-device = <&cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&sdm632_cpuss0_trip>;

				trip = <&sdm632_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 {

			cpu4_trip: apc1-cpu0-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu4_trip>;

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

			};

			modem_vdd_cdev {

				trip = <&cpu4_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	cpuss1-lowf {

	apc1-cpu1-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 6>;

		tracks-low;

		trips {

			cpu5_trip: apc1-cpu0-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu5_trip>;

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

			};

			modem_vdd_cdev {

				trip = <&cpu5_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 {

			cpu6_trip: apc1-cpu2-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu6_trip>;

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

			};

			modem_vdd_cdev {

				trip = <&cpu6_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 {

			cpu7_trip: apc1-cpu3-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&cpu7_trip>;

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

			};

			modem_vdd_cdev {

				trip = <&cpu7_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	apc1-l2-low {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";
@@ -361,7 +653,7 @@ 
		tracks-low;



		trips {

			sdm632_cpuss1_trip: cpuss1-trip {

			sdm632_cpuss0_trip: cpuss0-trip {

				temperature = <5000>;

				hysteresis = <5000>;

				type = "passive";
@@ -369,26 +661,26 @@ 
		};

		cooling-maps {

			cpu0_vdd_cdev {

				trip = <&sdm632_cpuss1_trip>;

				trip = <&sdm632_cpuss0_trip>;

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

						(THERMAL_MAX_LIMIT - 4)>;

			};

			gpu_vdd_cdev {

				trip = <&sdm632_cpuss1_trip>;

				trip = <&sdm632_cpuss0_trip>;

				cooling-device = <&msm_gpu 2 2>;

			};

			cx_vdd_cdev {

				trip = <&sdm632_cpuss1_trip>;

				trip = <&sdm632_cpuss0_trip>;

				cooling-device = <&cx_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&sdm632_cpuss1_trip>;

				trip = <&sdm632_cpuss0_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

		};

	};



	cpuss3-lowf {

	cpuss0-lowf {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

drivers/thermal/qcom/qti_virtual_sensor.c

+3 −3
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ static const struct virtual_sensor_data qti_virtual_sensors[] = { 
				"apc1-cpu1-usr",

				"apc1-cpu2-usr",

				"apc1-cpu3-usr",

				"cpuss0-usr",

				"cpuss1-usr",

				"cpuss3-usr"},

				"apc1-mhm-usr",

				"apc1-l2-usr",

				"cpuss0-usr"},

		.logic = VIRT_MAXIMUM,

	},

	{