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

Commit b50d5677 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 remote subsystem mitigation for sdm845"

parents ab3da72b 56f60de9

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

+391 −0
Original line number Diff line number Diff line
@@ -2972,6 +2972,61 @@ 
		qcom,vdd-3.3-ch0-config = <3104000 3312000>;

	};



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

			};

		};



		adsp {

			qcom,instance-id = <0x1>;



			adsp_vdd: adsp_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};

		};



		cdsp {

			qcom,instance-id = <0x43>;



			cdsp_vdd: cdsp_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};

		};



		slpi {

			qcom,instance-id = <0x53>;



			slpi_vdd: slpi_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};

		};

	};



	thermal_zones: thermal-zones {

		aoss0-usr {

			polling-delay-passive = <0>;
@@ -3831,6 +3886,22 @@ 
				trip = <&aoss0_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&aoss0_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&aoss0_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&aoss0_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&aoss0_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -3872,6 +3943,22 @@ 
				trip = <&cpu0_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpu0_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -3913,6 +4000,22 @@ 
				trip = <&cpu1_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpu1_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -3954,6 +4057,22 @@ 
				trip = <&cpu2_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpu2_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -3995,6 +4114,22 @@ 
				trip = <&cpu3_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpu3_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4036,6 +4171,22 @@ 
				trip = <&l3_0_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&l3_0_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&l3_0_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&l3_0_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&l3_0_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4077,6 +4228,22 @@ 
				trip = <&l3_1_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&l3_1_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&l3_1_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&l3_1_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&l3_1_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4118,6 +4285,22 @@ 
				trip = <&cpug0_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpug0_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpug0_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpug0_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpug0_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4159,6 +4342,22 @@ 
				trip = <&cpug1_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpug1_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpug1_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpug1_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpug1_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4200,6 +4399,22 @@ 
				trip = <&cpug2_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpug2_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpug2_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpug2_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpug2_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4241,6 +4456,22 @@ 
				trip = <&cpug3_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&cpug3_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&cpug3_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&cpug3_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&cpug3_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4282,6 +4513,22 @@ 
				trip = <&gpu0_trip_l>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&gpu0_trip_l>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&gpu0_trip_l>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&gpu0_trip_l>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&gpu0_trip_l>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4323,6 +4570,22 @@ 
				trip = <&gpu1_trip_l>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&gpu1_trip_l>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&gpu1_trip_l>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&gpu1_trip_l>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&gpu1_trip_l>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4364,6 +4627,22 @@ 
				trip = <&aoss1_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&aoss1_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&aoss1_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&aoss1_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&aoss1_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4405,6 +4684,22 @@ 
				trip = <&dsp_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&dsp_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&dsp_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&dsp_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&dsp_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4446,6 +4741,22 @@ 
				trip = <&ddr_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&ddr_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&ddr_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&ddr_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&ddr_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4487,6 +4798,22 @@ 
				trip = <&wlan_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&wlan_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&wlan_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&wlan_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&wlan_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4528,6 +4855,22 @@ 
				trip = <&hvx_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&hvx_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&hvx_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&hvx_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&hvx_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4569,6 +4912,22 @@ 
				trip = <&camera_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&camera_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4610,6 +4969,22 @@ 
				trip = <&mmss_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&mmss_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&mmss_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&mmss_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&mmss_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};
@@ -4651,6 +5026,22 @@ 
				trip = <&mdm_trip>;

				cooling-device = <&ebi_cdev 0 0>;

			};

			modem_vdd_cdev {

				trip = <&mdm_trip>;

				cooling-device = <&modem_vdd 0 0>;

			};

			adsp_vdd_cdev {

				trip = <&mdm_trip>;

				cooling-device = <&adsp_vdd 0 0>;

			};

			cdsp_vdd_cdev {

				trip = <&mdm_trip>;

				cooling-device = <&cdsp_vdd 0 0>;

			};

			slpi_vdd_cdev {

				trip = <&mdm_trip>;

				cooling-device = <&slpi_vdd 0 0>;

			};

		};

	};

};

arch/arm64/configs/sdm845-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ CONFIG_MSM_BCL_PERIPHERAL_CTL=y 
CONFIG_QTI_THERMAL_LIMITS_DCVS=y

CONFIG_QTI_VIRTUAL_SENSOR=y

CONFIG_QTI_REG_COOLING_DEVICE=y

CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_WCD9XXX_CODEC_CORE=y

arch/arm64/configs/sdm845_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ CONFIG_MSM_BCL_PERIPHERAL_CTL=y 
CONFIG_QTI_THERMAL_LIMITS_DCVS=y

CONFIG_QTI_VIRTUAL_SENSOR=y

CONFIG_QTI_REG_COOLING_DEVICE=y

CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_WCD9XXX_CODEC_CORE=y