diff options
| author | Sourabh Banerjee <sbanerje@codeaurora.org> | 2016-03-29 13:37:19 +0530 |
|---|---|---|
| committer | Viswanath Kraleti <vkraleti@codeaurora.org> | 2016-04-01 15:13:50 +0530 |
| commit | 2c4549324bdd8328cfe10fc76c20a9832f3f3cb1 (patch) | |
| tree | de9b0edb7f2563bc940853eb9df2e7722161c299 | |
| parent | d108350e461b79938dec8366ac165c56372f7837 (diff) | |
| download | qcom-msm-v3.10-2c4549324bdd8328cfe10fc76c20a9832f3f3cb1.tar.gz | |
power: qpnp-linear-charger: do not register battery when qcom,batt-if-disabled
BUG=24058529
Change-Id: I4ace4770200468109a9a85faf0ff50db4c9b2510
Signed-off-by: Sourabh Banerjee <sbanerje@codeaurora.org>
| -rw-r--r-- | drivers/power/qpnp-linear-charger.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/power/qpnp-linear-charger.c b/drivers/power/qpnp-linear-charger.c index e59cfc81787..411c2f96ae8 100644 --- a/drivers/power/qpnp-linear-charger.c +++ b/drivers/power/qpnp-linear-charger.c @@ -324,6 +324,7 @@ struct qpnp_lbc_chip { bool fastchg_on; bool cfg_use_external_charger; bool cfg_chgr_led_support; + bool cfg_disable_batt_if; unsigned int cfg_warm_bat_chg_ma; unsigned int cfg_cool_bat_chg_ma; unsigned int cfg_safe_voltage_mv; @@ -2278,6 +2279,11 @@ static int qpnp_charger_read_dt_props(struct qpnp_lbc_chip *chip) } } + /* Get the bat-if-disabled property */ + chip->cfg_disable_batt_if = + of_property_read_bool(chip->spmi->dev.of_node, + "qcom,batt-if-disabled"); + pr_debug("vddmax-mv=%d, vddsafe-mv=%d, vinmin-mv=%d, ibatsafe-ma=$=%d\n", chip->cfg_max_voltage_mv, chip->cfg_safe_voltage_mv, @@ -3061,7 +3067,7 @@ static int qpnp_lbc_main_probe(struct spmi_device *spmi) } } - if (chip->bat_if_base) { + if (chip->bat_if_base && !chip->cfg_disable_batt_if) { chip->batt_present = qpnp_lbc_is_batt_present(chip); chip->batt_psy.name = "battery"; chip->batt_psy.type = POWER_SUPPLY_TYPE_BATTERY; |