From 13f49164ad7635d24ab19fac07f403d4e521910f Mon Sep 17 00:00:00 2001 From: Philip Chen Date: Tue, 22 Aug 2017 10:44:33 -0700 Subject: [PATCH] charger/rt946x: Disable battery thermal protection We'll handle cell temperature from fuel gauge/battery side. BUG=b:64806333 BRANCH=none TEST=monitor charge current through 'battery' console command Change-Id: I82944de8d1e8834ca1f75c1f616b220e55d94f0e Signed-off-by: Philip Chen Reviewed-on: https://chromium-review.googlesource.com/626725 Commit-Ready: Philip Chen Tested-by: Philip Chen Reviewed-by: Aseda Aboagye --- 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 590b542977..1736af0794 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -338,6 +338,10 @@ static int rt946x_init_setting(void) return rv; /* Disable WDT */ rv = rt946x_enable_wdt(0); + if (rv) + return rv; + /* Disable battery thermal protection */ + rv = rt946x_clr_bit(RT946X_REG_CHGCTRL16, RT946X_MASK_JEITA_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 027de6f15e..dc25222700 100644 --- a/driver/charger/rt946x.h +++ b/driver/charger/rt946x.h @@ -191,6 +191,11 @@ #define RT946X_MASK_AICLMEAS (1 << RT946X_SHIFT_AICLMEAS) #define RT946X_MASK_AICLVTH 0x07 +/* ========== CHGCTRL16 0x10 ============ */ +#define RT946X_SHIFT_JEITA_EN 4 + +#define RT946X_MASK_JEITA_EN (1 << RT946X_SHIFT_JEITA_EN) + /* ========== CHGDPDM1 0x12 ============ */ #define RT946X_MASK_USBCHGEN (1 << 7)