summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/kakadu/board.c14
-rw-r--r--board/katsu/board.c14
-rw-r--r--driver/charger/rt946x.h11
3 files changed, 34 insertions, 5 deletions
diff --git a/board/kakadu/board.c b/board/kakadu/board.c
index 75eb9ac112..0031b986a5 100644
--- a/board/kakadu/board.c
+++ b/board/kakadu/board.c
@@ -500,3 +500,17 @@ void board_fill_source_power_info(int port,
r->max_power = r->meas.voltage_now * r->meas.current_max;
}
+/* b/207456334: bugged reserved bits causes device not charging */
+static void mt6370_reg_fix(void)
+{
+ i2c_update8(I2C_PORT_CHARGER,
+ RT946X_ADDR_FLAGS,
+ RT946X_REG_CHGCTRL1,
+ BIT(3) | BIT(5), MASK_CLR);
+ i2c_update8(I2C_PORT_CHARGER,
+ RT946X_ADDR_FLAGS,
+ RT946X_REG_CHGCTRL2,
+ BIT(5) | BIT(RT946X_SHIFT_BATDET_DIS_DLY),
+ MASK_CLR);
+}
+DECLARE_HOOK(HOOK_INIT, mt6370_reg_fix, HOOK_PRIO_DEFAULT);
diff --git a/board/katsu/board.c b/board/katsu/board.c
index 4a39e17148..4dc5a09f07 100644
--- a/board/katsu/board.c
+++ b/board/katsu/board.c
@@ -402,3 +402,17 @@ void board_fill_source_power_info(int port,
r->max_power = r->meas.voltage_now * r->meas.current_max;
}
+/* b/207456334: bugged reserved bits causes device not charging */
+static void mt6370_reg_fix(void)
+{
+ i2c_update8(I2C_PORT_CHARGER,
+ RT946X_ADDR_FLAGS,
+ RT946X_REG_CHGCTRL1,
+ BIT(3) | BIT(5), MASK_CLR);
+ i2c_update8(I2C_PORT_CHARGER,
+ RT946X_ADDR_FLAGS,
+ RT946X_REG_CHGCTRL2,
+ BIT(5) | BIT(RT946X_SHIFT_BATDET_DIS_DLY),
+ MASK_CLR);
+}
+DECLARE_HOOK(HOOK_INIT, mt6370_reg_fix, HOOK_PRIO_DEFAULT);
diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h
index 99723c905f..74b81887da 100644
--- a/driver/charger/rt946x.h
+++ b/driver/charger/rt946x.h
@@ -294,11 +294,12 @@
#define RT946X_MASK_STAT_EN BIT(RT946X_SHIFT_STAT_EN)
/* ========== CHGCTRL2 0x02 ============ */
-#define RT946X_SHIFT_SHIP_MODE 7
-#define RT946X_SHIFT_TE 4
-#define RT946X_SHIFT_ILMTSEL 2
-#define RT946X_SHIFT_CFO_EN 1
-#define RT946X_SHIFT_CHG_EN 0
+#define RT946X_SHIFT_SHIP_MODE 7
+#define RT946X_SHIFT_BATDET_DIS_DLY 6
+#define RT946X_SHIFT_TE 4
+#define RT946X_SHIFT_ILMTSEL 2
+#define RT946X_SHIFT_CFO_EN 1
+#define RT946X_SHIFT_CHG_EN 0
#define RT946X_MASK_SHIP_MODE BIT(RT946X_SHIFT_SHIP_MODE)
#define RT946X_MASK_TE BIT(RT946X_SHIFT_TE)