evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: qpnp-lcdb: Disable the SC irq only for PM660L V1.1 and below

Browse source 
PM660L v2.0 has the NCP power-on issue fixed. This allows enabling the
short-circuit IRQ. Enable the same.

Change-Id: I4c0523ef8c46dd9bac190d4ad69190ef777ef14b
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
This commit is contained in:
Kiran Gunda 2018-06-27 11:14:21 +05:30 • committed by Gerrit - the friendly Code Review server
parent 0fe549f6b6
commit fadfa06fbf
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/regulator/qpnp-lcdb-regulator.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -198,6 +198,7 @@ struct qpnp_lcdb {
struct regmap *regmap;
struct pmic_revid_data *pmic_rev_id;
u32 base;
u32 wa_flags;
int sc_irq;
/* TTW params */
@ -265,6 +266,10 @@ enum lcdb_settings_index {
LCDB_SETTING_MAX,
};
enum lcdb_wa_flags {
NCP_SCP_DISABLE_WA = BIT(0),
};
static u32 soft_start_us[] = {
0,
500,
@ -606,9 +611,7 @@ static int qpnp_lcdb_enable_wa(struct qpnp_lcdb *lcdb)
return rc;
}
/* execute the below for rev1.1 */
if (lcdb->pmic_rev_id->rev3 == PM660L_V1P1_REV3 &&
lcdb->pmic_rev_id->rev4 == PM660L_V1P1_REV4) {
if (lcdb->wa_flags & NCP_SCP_DISABLE_WA) {
/*
* delay to make sure that the MID pin – ie the
* output of the LCDB boost – returns to 0V
@ -1720,11 +1723,27 @@ static int qpnp_lcdb_init_bst(struct qpnp_lcdb *lcdb)
return 0;
}
static void qpnp_lcdb_pmic_config(struct qpnp_lcdb *lcdb)
{
switch (lcdb->pmic_rev_id->pmic_subtype) {
case PM660L_SUBTYPE:
if (lcdb->pmic_rev_id->rev4 < PM660L_V2P0_REV4)
lcdb->wa_flags |= NCP_SCP_DISABLE_WA;
break;
default:
break;
}
pr_debug("LCDB wa_flags = 0x%2x\n", lcdb->wa_flags);
}
static int qpnp_lcdb_hw_init(struct qpnp_lcdb *lcdb)
{
int rc = 0;
u8 val = 0;
qpnp_lcdb_pmic_config(lcdb);
rc = qpnp_lcdb_init_bst(lcdb);
if (rc < 0) {
pr_err("Failed to initialize BOOST rc=%d\n", rc);
@ -1743,8 +1762,7 @@ static int qpnp_lcdb_hw_init(struct qpnp_lcdb *lcdb)
return rc;
}
if (lcdb->sc_irq >= 0 &&
lcdb->pmic_rev_id->pmic_subtype != PM660L_SUBTYPE) {
if (lcdb->sc_irq >= 0 && !(lcdb->wa_flags & NCP_SCP_DISABLE_WA)) {
lcdb->sc_count = 0;
rc = devm_request_threaded_irq(lcdb->dev, lcdb->sc_irq,
NULL, qpnp_lcdb_sc_irq_handler, IRQF_ONESHOT,