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

Commit fc867e25 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 name of 9v parallel current threshold property"

parents 1591d86a bee7940e

Documentation/devicetree/bindings/power/qpnp-smbcharger.txt

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ Optional Properties: 
					charger if one exists. Do not define

					this property if no parallel chargers

					exist.

- qcom,parallel-usb-9v-min-current-ma	Minimum current drawn by the primary

					charger before enabling the parallel

					charger if one exists. This property

					applies only for 9V chargers.

- qcom,parallel-allowed-lowering-ma	Acceptable current drop from the initial limit

					to keep parallel charger activated. If the

					charger current reduces beyond this threshold

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

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
			qcom,bms-psy-name = "bms";

			qcom,thermal-mitigation = <1500 700 600 0>;

			qcom,parallel-usb-min-current-ma = <1400>;

			qcom,parallel-9v-usb-min-current-ma = <900>;

			qcom,parallel-usb-9v-min-current-ma = <900>;

			qcom,parallel-allowed-lowering-ma = <500>;



			qcom,chgr@1000 {