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

Commit 38b43ff7 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 flash_wa regulator support for msm8974 flash"

parents 103a3965 86a8199d

arch/arm/boot/dts/qcom/msm-pm8941.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
		qcom,chg-adc_tm = <&pm8941_adc_tm>;

		qcom,ibat-calibration-enabled;



		qcom,chgr@1000 {

		pm8941_chg_chgr: qcom,chgr@1000 {

			status = "disabled";

			reg = <0x1000 0x100>;

			interrupts =	<0x0 0x10 0x0>,
@@ -1264,6 +1264,7 @@ 
		compatible = "qcom,leds-qpnp";

		reg = <0xd300 0x100>;

		label = "flash";

		flash-wa-supply = <&pm8941_chg_chgr>;

	};



	qcom,leds@d400 {

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

+4 −0
Original line number Diff line number Diff line
@@ -597,3 +597,7 @@ 
&pm8941_chg_otg {

	regulator-name = "8941_smbb_otg";

};



&pm8941_chg_chgr {

	regulator-name = "flash_wa";

};