diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-01 23:49:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-01 23:49:12 -0700 |
| commit | 985d03300dcb647b2540e01bdb43c52e10504744 (patch) | |
| tree | 18d0cb6c2f5103bef158589b0ab2eb9f7783c65c /arch/arm | |
| parent | 99beece72f1afc37bbdaa51cf437e412962119f9 (diff) | |
| parent | 6124f7574427070e5772366e3ceb53151303104f (diff) | |
Merge "qpnp-fg-gen3: configure ESR timers dynamically based on charge termination"
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pm660.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pmi8998.dtsi | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pm660.dtsi b/arch/arm/boot/dts/qcom/msm-pm660.dtsi index 05225f7178e9..93aeef07cfe0 100644 --- a/arch/arm/boot/dts/qcom/msm-pm660.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pm660.dtsi @@ -550,9 +550,9 @@ io-channel-names = "rradc_batt_id", "rradc_die_temp"; qcom,rradc-base = <0x4500>; - qcom,fg-esr-timer-awake = <96>; - qcom,fg-esr-timer-asleep = <256>; - qcom,fg-esr-timer-charging = <96>; + qcom,fg-esr-timer-awake = <96 96>; + qcom,fg-esr-timer-asleep = <256 256>; + qcom,fg-esr-timer-charging = <0 96>; qcom,cycle-counter-en; status = "okay"; diff --git a/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi index 2b0fcb77eaf2..684f6cf9b389 100644 --- a/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi @@ -337,8 +337,9 @@ io-channels = <&pmi8998_rradc 0>; io-channel-names = "rradc_batt_id"; qcom,rradc-base = <0x4500>; - qcom,fg-esr-timer-awake = <96>; - qcom,fg-esr-timer-asleep = <256>; + qcom,fg-esr-timer-awake = <96 96>; + qcom,fg-esr-timer-asleep = <256 256>; + qcom,fg-esr-timer-charging = <0 96>; qcom,cycle-counter-en; status = "okay"; |