From dc170640c7edc2bc0c4ff54f6ffe844a082424c9 Mon Sep 17 00:00:00 2001 From: Philip Chen Date: Mon, 12 Feb 2018 18:26:24 -0800 Subject: [PATCH] charger/rt946x: Disable charge timer If the charge timer expires, rt946x would stop charging. We don't need this function. BUG=b:72571372 BRANCH=scarlet TEST=read reg 0x12 and confirm TMR_EN == 0 Change-Id: I38137ac39c7e7dfd15f12342428708697f81922c Signed-off-by: Philip Chen Reviewed-on: https://chromium-review.googlesource.com/915501 Commit-Ready: Philip Chen Tested-by: Philip Chen Reviewed-by: Philip Chen Reviewed-by: David Schneider --- driver/charger/rt946x.c | 4 ++++ driver/charger/rt946x.h | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c index 6d1eacc6a9..9fb08a03c2 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -364,6 +364,10 @@ static int rt946x_init_setting(void) return rv; /* Disable battery thermal protection */ rv = rt946x_clr_bit(RT946X_REG_CHGCTRL16, RT946X_MASK_JEITA_EN); + if (rv) + return rv; + /* Disable charge timer */ + rv = rt946x_clr_bit(RT946X_REG_CHGCTRL12, RT946X_MASK_TMR_EN); if (rv) return rv; rv = rt946x_set_mivr(rt946x_charger_init_setting.mivr); diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h index 481277726f..80f18bd4ee 100644 --- a/driver/charger/rt946x.h +++ b/driver/charger/rt946x.h @@ -189,6 +189,11 @@ #define RT946X_MASK_BOOST_CURRENT 0x07 +/* ========== CHGCTRL12 0x0C ============ */ +#define RT946X_SHIFT_TMR_EN 1 + +#define RT946X_MASK_TMR_EN (1 << RT946X_SHIFT_TMR_EN) + /* ========== CHGCTRL13 0x0D ============ */ #define RT946X_SHIFT_WDT_EN 7