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

Commit 9aaf60b5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add devfreq-vdd-cdev cooling device and remove gfx-cdev"

parents ecd9e357 9c080396

qcom/holi-regulators-pm6125.dtsi

+0 −14
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ 
		regulator-s3-level-ao {

			status = "disabled";

		};



		gfx-cdev {

			status = "disabled";

		};

	};



	/* Disable mx_cdev for PM6150A */
@@ -434,16 +430,6 @@ 
					<RPM_SMD_REGULATOR_LEVEL_BINNING>;

			qcom,use-voltage-level;

		};



		gfx_cdev: gfx-cdev {

			status = "okay";

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&S8A_LEVEL_AO>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NONE

					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;

			#cooling-cells = <2>;

		};



	};



	/* VDD_LPI_CX supply */

qcom/holi-regulators-pm6350.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -50,14 +50,6 @@ 
					<RPM_SMD_REGULATOR_LEVEL_BINNING>;

			qcom,use-voltage-level;

		};



		gfx_cdev: gfx-cdev {

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&S3A_LEVEL_AO>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION

					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;

			#cooling-cells = <2>;

		};

	};



	/* PM6350 L1 - VDD_MX supply */

qcom/holi-thermal.dtsi

+10 −4
Original line number Diff line number Diff line
@@ -72,6 +72,12 @@ 
		#cooling-cells = <2>;

		status = "disabled";

	};



	devfreq_vdd_cdev: devfreq-vdd-cdev {

		compatible = "qcom,devfreq-vdd-cooling-device";

		devfreq = <&msm_gpu>;

		#cooling-cells = <2>;

	};

};



&rpm_bus {
@@ -1167,9 +1173,9 @@ 
				cooling-device = <&mx_cdev 1 1>;

			};



			gfx_vdd_cdev {

			devfreq_vdd_cdev {

				trip = <&zeroc_0_trip>;

				cooling-device = <&gfx_cdev 1 1>;

				cooling-device = <&devfreq_vdd_cdev 2 2>;

			};



			adsp_vdd_cdev {
@@ -1214,9 +1220,9 @@ 
				cooling-device = <&mx_cdev 1 1>;

			};



			gfx_vdd_cdev {

			devfreq_vdd_cdev {

				trip = <&zeroc_1_trip>;

				cooling-device = <&gfx_cdev 1 1>;

				cooling-device = <&devfreq_vdd_cdev 2 2>;

			};



			adsp_vdd_cdev {