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

Commit 1d245aea 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: fix order of otg regulator declaration for PMI8950/37"

parents 72861638 d1c49c5e

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

+4 −4
Original line number Diff line number Diff line
@@ -178,10 +178,6 @@ 
			qcom,parallel-allowed-lowering-ma = <500>;

			qcom,pmic-revid = <&pmi8937_revid>;



			smbcharger_charger_otg: qcom,smbcharger-boost-otg {

				regulator-name = "smbcharger_charger_otg";

			};



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =	<0x2 0x10 0x0>,
@@ -271,6 +267,10 @@ 
							"otst2",

							"otst3";

			};



			smbcharger_charger_otg: qcom,smbcharger-boost-otg {

				regulator-name = "smbcharger_charger_otg";

			};

		};



		pmi8937_fg: qcom,fg {

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

+4 −4
Original line number Diff line number Diff line
@@ -207,10 +207,6 @@ 
			qcom,enable-hvdcp-9v;

			qcom,pmic-revid = <&pmi8950_revid>;



			smbcharger_charger_otg: qcom,smbcharger-boost-otg {

				regulator-name = "smbcharger_charger_otg";

			};



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =	<0x2 0x10 0x0>,
@@ -300,6 +296,10 @@ 
							"otst2",

							"otst3";

			};



			smbcharger_charger_otg: qcom,smbcharger-boost-otg {

				regulator-name = "smbcharger_charger_otg";

			};

		};



		pmi8950_fg: qcom,fg {