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

Commit 1cd71605 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM64: dts: msm8994: change PMI8994 boost to RPM control"

parents 1a70e6ab 5fff0178

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

+15 −0
Original line number Original line Diff line number Diff line
@@ -648,4 +648,19 @@ 
			status = "disabled";

			status = "disabled";

		};

		};

	};

	};



	rpm-regulator-bstb {

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

		qcom,resource-name = "bstb";

		qcom,resource-id = <1>;

		qcom,regulator-type = <2>;

		status = "disabled";



		regulator-bst {

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

			regulator-name = "pmi8994_boost";

			qcom,set = <3>;

			status = "disabled";

		};

	};

};
 
};

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

+7 −11
Original line number Original line Diff line number Diff line
@@ -10,17 +10,6 @@ 
 * GNU General Public License for more details.

 * GNU General Public License for more details.

 */

 */





/* Stub regulators */



/ {

	pmi8994_boost: regulator-pmi8994-boost {

		compatible = "qcom,stub-regulator";

		regulator-name = "pmi8994-boost";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};

};



&rpm_bus {

&rpm_bus {

	/* PM8994 S1 + S6 = 2 phase VDD_CX supply */

	/* PM8994 S1 + S6 = 2 phase VDD_CX supply */

	rpm-regulator-smpa1 {

	rpm-regulator-smpa1 {
@@ -462,6 +451,13 @@ 
			qcom,always-send-voltage;

			qcom,always-send-voltage;

		};

		};

	};

	};



	rpm-regulator-bstb {

		status = "okay";

		pmi8994_boost: regulator-bst {

			status = "okay";

		};

	};

};

};





/* SPM controlled regulators: */

/* SPM controlled regulators: */