Merge "defconfig: msm: Disable RPM SMD cooling device driver for TRINKET" (6055217b) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+0 −217

Original line number	Diff line number	Diff line
		@@ -99,13 +99,6 @@
		};
		};

		&rpm_bus {
		rpm_smd_cdev: rpm-smd-cdev {
		compatible = "qcom,rpm-smd-cooling-device";
		#cooling-cells = <2>;
		};
		};

		&thermal_zones {
		rf-pa0-therm-adc {
		polling-delay-passive = <0>;
		@@ -861,27 +854,6 @@
		};
		};

		aoss0-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 0>;
		tracks-low;
		trips {
		aoss0_lowc: aoss0-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&aoss0_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		cdsp-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -959,27 +931,6 @@
		};
		};

		cdsp-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 1>;
		tracks-low;
		trips {
		cdsp_lowc: cdsp-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&cdsp_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		wlan-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1057,27 +1008,6 @@
		};
		};

		wlan-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 2>;
		tracks-low;
		trips {
		wlan_lowc: wlan-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&wlan_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		camera-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1155,27 +1085,6 @@
		};
		};

		camera-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 3>;
		tracks-low;
		trips {
		camera_lowc: camera-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&camera_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		video-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1253,27 +1162,6 @@
		};
		};

		video-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 4>;
		tracks-low;
		trips {
		video_lowc: video-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&video_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		cpu-1-0-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1351,27 +1239,6 @@
		};
		};

		cpu-1-0-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 9>;
		tracks-low;
		trips {
		cpu_1_0_lowc: cpu-1-0-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&cpu_1_0_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		cpuss-0-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1449,27 +1316,6 @@
		};
		};

		cpuss-0-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 6>;
		tracks-low;
		trips {
		cpuss_2_lowc: cpuss-2-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&cpuss_2_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		mdm-core-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1547,27 +1393,6 @@
		};
		};

		mdm-core-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 13>;
		tracks-low;
		trips {
		mdm_core_lowc: mdm-core-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&mdm_core_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		display-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1645,27 +1470,6 @@
		};
		};

		display-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 14>;
		tracks-low;
		trips {
		display_lowc: display-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&display_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		gpu-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1743,27 +1547,6 @@
		};
		};

		gpu-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "low_limits_cap";
		thermal-sensors = <&tsens0 15>;
		tracks-low;
		trips {
		gpu_lowc: gpu-lowc {
		temperature = <5000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		rpm_smd_cdev {
		trip = <&gpu_lowc>;
		cooling-device = <&rpm_smd_cdev 2 2>;
		};
		};
		};

		cdsp-step {
		polling-delay-passive = <10>;
		polling-delay = <0>;

arch/arm64/configs/vendor/trinket-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -364,7 +364,6 @@ CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_QTI_ADC_TM=y
		CONFIG_QTI_CX_IPEAK_COOLING_DEVICE=y
		CONFIG_QTI_RPM_SMD_COOLING_DEVICE=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y

arch/arm64/configs/vendor/trinket_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -379,7 +379,6 @@ CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_QTI_ADC_TM=y
		CONFIG_QTI_CX_IPEAK_COOLING_DEVICE=y
		CONFIG_QTI_RPM_SMD_COOLING_DEVICE=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y