summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-30 07:05:13 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-30 07:05:12 -0800
commita3ab00251b26331eaba5d549693dfc1610e52277 (patch)
treec67eeea44dd819caf0eafb757723571b3b2278d4
parentf1c56b5374164cd17d94f07716c4868204ff4c50 (diff)
parent635dca1f6ae9ed278357666b8210fcffc348cf29 (diff)
Merge "smb-lib: fix unknown APSD result after CC2 workaround"
-rw-r--r--drivers/power/supply/qcom/smb-lib.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c
index 5f840f233f20..c6af4fb1e193 100644
--- a/drivers/power/supply/qcom/smb-lib.c
+++ b/drivers/power/supply/qcom/smb-lib.c
@@ -2346,6 +2346,12 @@ int smblib_reg_block_restore(struct smb_charger *chg,
static struct reg_info cc2_detach_settings[] = {
{
+ .reg = TYPE_C_CFG_REG,
+ .mask = APSD_START_ON_CC_BIT,
+ .val = 0,
+ .desc = "TYPE_C_CFG_REG",
+ },
+ {
.reg = TYPE_C_CFG_2_REG,
.mask = TYPE_C_UFP_MODE_BIT | EN_TRY_SOURCE_MODE_BIT,
.val = TYPE_C_UFP_MODE_BIT,