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

Commit 01e07424 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: change the order of LAB/IBB regulator definition for PMI8950"

parents bae43924 82e61c67

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

+31 −30
Original line number Diff line number Diff line
@@ -417,36 +417,6 @@ 
			#address-cells = <1>;

			#size-cells = <1>;



			lab_regulator: qcom,lab@de00 {

				reg = <0xde00 0x100>;

				reg-names = "lab";

				regulator-name = "lab_reg";



				regulator-min-microvolt = <4600000>;

				regulator-max-microvolt = <6000000>;



				qcom,qpnp-lab-min-voltage = <4600000>;

				qcom,qpnp-lab-step-size = <100000>;

				qcom,qpnp-lab-slew-rate = <5000>;

				qcom,qpnp-lab-use-default-voltage;

				qcom,qpnp-lab-init-voltage = <5500000>;

				qcom,qpnp-lab-init-amoled-voltage = <4600000>;

				qcom,qpnp-lab-init-lcd-voltage = <5500000>;



				qcom,qpnp-lab-soft-start = <800>;



				qcom,qpnp-lab-full-pull-down;

				qcom,qpnp-lab-pull-down-enable;

				qcom,qpnp-lab-switching-clock-frequency = <1600>;

				qcom,qpnp-lab-limit-maximum-current = <800>;

				qcom,qpnp-lab-limit-max-current-enable;

				qcom,qpnp-lab-ps-threshold = <40>;

				qcom,qpnp-lab-ps-enable;

				qcom,qpnp-lab-nfet-size = <100>;

				qcom,qpnp-lab-pfet-size = <100>;

				qcom,qpnp-lab-max-precharge-time = <300>;

			};



			ibb_regulator: qcom,ibb@dc00 {

				reg = <0xdc00 0x100>;

				reg-names = "ibb_reg";
@@ -479,6 +449,37 @@ 
				qcom,qpnp-ibb-ps-enable;

			};



			lab_regulator: qcom,lab@de00 {

				reg = <0xde00 0x100>;

				reg-names = "lab";

				regulator-name = "lab_reg";



				regulator-min-microvolt = <4600000>;

				regulator-max-microvolt = <6000000>;



				qcom,qpnp-lab-min-voltage = <4600000>;

				qcom,qpnp-lab-step-size = <100000>;

				qcom,qpnp-lab-slew-rate = <5000>;

				qcom,qpnp-lab-use-default-voltage;

				qcom,qpnp-lab-init-voltage = <5500000>;

				qcom,qpnp-lab-init-amoled-voltage = <4600000>;

				qcom,qpnp-lab-init-lcd-voltage = <5500000>;



				qcom,qpnp-lab-soft-start = <800>;



				qcom,qpnp-lab-full-pull-down;

				qcom,qpnp-lab-pull-down-enable;

				qcom,qpnp-lab-switching-clock-frequency =

									<1600>;

				qcom,qpnp-lab-limit-maximum-current = <800>;

				qcom,qpnp-lab-limit-max-current-enable;

				qcom,qpnp-lab-ps-threshold = <40>;

				qcom,qpnp-lab-ps-enable;

				qcom,qpnp-lab-nfet-size = <100>;

				qcom,qpnp-lab-pfet-size = <100>;

				qcom,qpnp-lab-max-precharge-time = <300>;

			};



		};



		qcom,leds@d800 {