Merge "ARM: dts: msm: Add default thermal zone rules for MSM8917/QM215" (0f8c3985) · Commits · e / devices / android_kernel_fairphone_FP3

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		efficiency = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		next-level-cache = <&L2_1>;
		#cooling-cells = <2>;
		L2_1: l2-cache {
		compatible = "arm,arch-cache";
		cache-level = <2>;
		@@ -75,6 +76,7 @@
		efficiency = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		next-level-cache = <&L2_1>;
		#cooling-cells = <2>;
		L1_I_101: l1-icache {
		compatible = "arm,arch-cache";
		qcom,dump-size = <0x8800>;
		@@ -94,6 +96,7 @@
		efficiency = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		next-level-cache = <&L2_1>;
		#cooling-cells = <2>;
		L1_I_102: l1-icache {
		compatible = "arm,arch-cache";
		qcom,dump-size = <0x8800>;
		@@ -113,6 +116,7 @@
		efficiency = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		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/msm8917-gpu.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,9 @@
		/* CPU latency parameter */
		qcom,pm-qos-active-latency = <651>;

		/* Enable gpu cooling device */
		#cooling-cells = <2>;

		/* Power levels */
		qcom,gpu-pwrlevels {
		#address-cells = <1>;

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

+215 −6

Original line number	Diff line number	Diff line
		@@ -12,6 +12,36 @@

		#include <dt-bindings/thermal/thermal.h>

		&soc {
		qmi-tmd-devices {
		compatible = "qcom,qmi_cooling_devices";

		modem {
		qcom,instance-id = <0x0>;

		modem_pa: modem_pa {
		qcom,qmi-dev-name = "pa";
		#cooling-cells = <2>;
		};

		modem_proc: modem_proc {
		qcom,qmi-dev-name = "modem";
		#cooling-cells = <2>;
		};

		modem_current: modem_current {
		qcom,qmi-dev-name = "modem_current";
		#cooling-cells = <2>;
		};

		modem_vdd: modem_vdd {
		qcom,qmi-dev-name = "cpuv_restriction_cold";
		#cooling-cells = <2>;
		};
		};
		};
		};

		&thermal_zones {
		aoss0-usr {
		polling-delay-passive = <0>;
		@@ -41,7 +71,7 @@
		};
		};

		mdss-usr {
		q6-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		@@ -69,7 +99,7 @@
		};
		};

		cpuss-0-usr {
		cpuss-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 4>;
		@@ -83,7 +113,7 @@
		};
		};

		apc1-cpu1-usr {
		apc1-cpu0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 5>;
		@@ -97,7 +127,7 @@
		};
		};

		apc1-cpu2-usr {
		apc1-cpu1-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 6>;
		@@ -111,7 +141,7 @@
		};
		};

		apc1-cpu3-usr {
		apc1-cpu2-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 7>;
		@@ -125,7 +155,7 @@
		};
		};

		apc1-cpu4-usr {
		apc1-cpu3-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 8>;
		@@ -152,4 +182,183 @@
		};
		};
		};

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

		gpu0-step {
		polling-delay-passive = <250>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 9>;
		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>;
		};
		};
		};

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

		aoss0-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_floor";
		thermal-sensors = <&tsens0 0>;
		tracks-low;
		trips {
		aoss_lowf: aoss-lowf {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		cpu0_cdev {
		trip = <&aoss_lowf>;
		cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-2)
		(THERMAL_MAX_LIMIT-2)>;
		};
		cx_vdd_cdev {
		trip = <&aoss_lowf>;
		cooling-device = <&pm8937_cx_cdev 0 0>;
		};
		modem_vdd_cdev {
		trip = <&aoss_lowf>;
		cooling-device = <&modem_vdd 0 0>;
		};
		};
		};
		};

arch/arm64/boot/dts/qcom/qm215-pm8916.dtsi

+24 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,22 @@

		/* delete all node referring PM8937 */
		&soc {
		/delete-node/ thermal-zones;
		thermal-zones {
		/delete-node/ pa-therm1-adc;
		/delete-node/ xo-therm-adc;
		/delete-node/ xo-therm-buf-adc;
		/delete-node/ case-therm-adc;
		/delete-node/ pa-therm0-adc;
		/delete-node/ pm8937_tz;

		aoss0-lowf {
		cooling-maps {
		cx_vdd_cdev {
		/delete-property/ cooling-device;
		};
		};
		};
		};

		qcom,cpu-clock-8939@b111050 {
		/delete-property/ vdd-c1-supply;
		@@ -442,6 +457,14 @@
		};
		};
		};

		aoss0-lowf {
		cooling-maps {
		cx_vdd_cdev {
		cooling-device = <&pm8916_cx_cdev 0 0>;
		};
		};
		};
		};
		};

arch/arm64/boot/dts/qcom/qm215-regulator.dtsi

+8 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,14 @@
		qcom,use-voltage-floor-level;
		qcom,always-send-voltage;
		};

		pm8916_cx_cdev: regulator-cx-cdev {
		compatible = "qcom,regulator-cooling-device";
		regulator-cdev-supply = <&pm8916_s1_floor_level>;
		regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM_PLUS
		RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		#cooling-cells = <2>;
		};
		};

		rpm-regulator-smpa3 {