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

Commit 74d2df2c 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 rpm-regulator node to notify APC corner on 8952"

parents fbd57a13 8c955c31

arch/arm/boot/dts/qcom/msm-pm8950-rpm-regulator.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -363,4 +363,20 @@ 
			status = "disabled";

		};

	};



	/* Regulator to notify APC corner to RPM */

	rpm-regulator-clk0 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "clk0";

		qcom,resource-id = <3>;

		qcom,regulator-type = <1>;

		status = "disabled";



		regulator-clk0 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "rpm_apc";

			qcom,set = <3>;

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/qcom/msm8952-regulator.dtsi

+25 −3
Original line number Diff line number Diff line
@@ -276,6 +276,18 @@ 
			status = "okay";

		};

	};



	rpm-regulator-clk0 {

		status = "okay";

		rpm_apc_vreg: regulator-clk0 {

			regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_SVS>;

			regulator-max-microvolt =

						<RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,use-voltage-level;

			qcom,always-send-voltage;

			status = "okay";

		};

	};

};



/* SPM controlled regulators */
@@ -321,6 +333,9 @@ 
		qcom,cpr-voltage-floor = <1050000 1050000 1155000>;

		vdd-apc-supply = <&pm8950_s5>;



		vdd-mx-supply = <&pm8950_l3_level_ao>;

		qcom,vdd-mx-vmin-method = <5>;

		qcom,vdd-mx-vmax = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

		qcom,vdd-mx-corner-map = < RPM_SMD_REGULATOR_LEVEL_SVS >,	/* 1: SVS  */

					 < RPM_SMD_REGULATOR_LEVEL_SVS_PLUS >,	/* 2: SVS+ */

					 < RPM_SMD_REGULATOR_LEVEL_SVS_PLUS >,	/* 3: SVS+ */
@@ -329,9 +344,16 @@ 
					 < RPM_SMD_REGULATOR_LEVEL_NOM_PLUS >,	/* 6: NOM+ */

					 < RPM_SMD_REGULATOR_LEVEL_TURBO >,	/* 7: TUR  */

					 < RPM_SMD_REGULATOR_LEVEL_TURBO >;	/* 8: TUR  */

		qcom,vdd-mx-vmin-method = <5>;

		vdd-mx-supply = <&pm8950_l3_level_ao>;

		qcom,vdd-mx-vmax = <RPM_SMD_REGULATOR_LEVEL_TURBO>;



		rpm-apc-supply = <&rpm_apc_vreg>;

		qcom,rpm-apc-corner-map =  <RPM_SMD_REGULATOR_LEVEL_SVS>,

					 <RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>,

					 <RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>,

					 <RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>,

					 <RPM_SMD_REGULATOR_LEVEL_NOM>,

					 <RPM_SMD_REGULATOR_LEVEL_NOM_PLUS>,

					 <RPM_SMD_REGULATOR_LEVEL_TURBO>,

					 <RPM_SMD_REGULATOR_LEVEL_TURBO>;



		mem-acc-supply = <&mem_acc_vreg_corner>;