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

Commit 399d2a83 authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  Re-charge condition for battery to 4.3V

Change-Id: Ic18f7c89a91d1e7bd61bca2c01b7083bd7b9193c
parents b6f3230d 1f446091
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -313,7 +313,10 @@

			qcom,pmic-revid = <&pmi632_revid>;
			dpdm-supply = <&qusb_phy>;
			qcom,auto-recharge-soc = <98>;
//<--[Fairphone][Charging][JasonHsing] Re-charge condition for battery to 4.3V 20190103 BEGIN -
			qcom,auto-recharge-vbat-mv = <4300>;
			//qcom,auto-recharge-soc = <98>;
//-->[Fairphone][Charging][JasonHsing] Re-charge condition for battery to 4.3V 20190103 END -
			qcom,chg-vadc = <&pmi632_vadc>;
			qcom,flash-disable-soc = <10>;
			qcom,sw-jeita-enable;
@@ -483,8 +486,10 @@
			#size-cells = <1>;

			qcom,qg-iterm-ma = <100>;
			qcom,hold-soc-while-full;
			qcom,linearize-soc;
//<--[Fairphone][Charging][JasonHsing] Re-charge condition for battery to 4.3V 20190103 BEGIN -
			//qcom,hold-soc-while-full;
			//qcom,linearize-soc;
//-->[Fairphone][Charging][JasonHsing] Re-charge condition for battery to 4.3V 20190103 END -
			qcom,qg-vadc = <&pmi632_vadc>;
			qcom,pmic-revid = <&pmi632_revid>;