Merge "power: smb5: Explicitly enable USBIN AICL for redundancy"

This commit is contained in:
qctecmdr Service 2018-09-09 04:18:41 -07:00 committed by Gerrit - the friendly Code Review server
commit 3d98ae90e5
2 changed files with 4 additions and 2 deletions

View File

@ -1849,8 +1849,9 @@ static int smb5_init_hw(struct smb5 *chip)
if (chg->smb_version != PMI632_SUBTYPE) {
rc = smblib_masked_write(chg, USBIN_AICL_OPTIONS_CFG_REG,
USBIN_AICL_PERIODIC_RERUN_EN_BIT
| USBIN_AICL_ADC_EN_BIT,
USBIN_AICL_PERIODIC_RERUN_EN_BIT);
| USBIN_AICL_ADC_EN_BIT | USBIN_AICL_EN_BIT,
USBIN_AICL_PERIODIC_RERUN_EN_BIT
| USBIN_AICL_EN_BIT);
if (rc < 0) {
dev_err(chg->dev, "Couldn't config AICL rc=%d\n", rc);
return rc;

View File

@ -278,6 +278,7 @@ enum {
#define SUSPEND_ON_COLLAPSE_USBIN_BIT BIT(7)
#define USBIN_AICL_PERIODIC_RERUN_EN_BIT BIT(4)
#define USBIN_AICL_ADC_EN_BIT BIT(3)
#define USBIN_AICL_EN_BIT BIT(2)
#define USB_ENG_SSUPPLY_USB2_REG (USBIN_BASE + 0xC0)
#define ENG_SSUPPLY_12V_OV_OPT_BIT BIT(1)