From f48d3ed383c3c700c3384e1b20eda7f2f0572dfe Mon Sep 17 00:00:00 2001 From: Andrei Ciubotariu Date: Fri, 10 Nov 2023 21:44:28 -0800 Subject: smblite: Rename and export boost status getter - Rename to smblite_lib_is_boost_en() since is_boost_en() does not sound very unique. - Export symbol so other modules can use this function to check if PMIC is in boost mode. Bug: 308351023 Signed-off-by: Andrei Ciubotariu (cherry picked from https://partner-android-review.googlesource.com/q/commit:d844e4dd58fc7dbf73a2659b4e207dccc0a97d07) (cherry picked from commit 25c595a1d9f41ac2834b4a1b83f92d1f44dd4f5d) (cherry picked from https://partner-android-review.googlesource.com/q/commit:865ee5f495bfbdddc2c77c727334e3a16aeec151) Merged-In: Ie67a322f7a768e74750f055869e2dc3e30906e45 Change-Id: Ie67a322f7a768e74750f055869e2dc3e30906e45 --- drivers/power/supply/qcom/smblite-lib.c | 17 +++++++++-------- drivers/power/supply/qcom/smblite-lib.h | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/power/supply/qcom/smblite-lib.c b/drivers/power/supply/qcom/smblite-lib.c index 18744c615033..3ab6bd4cc6da 100644 --- a/drivers/power/supply/qcom/smblite-lib.c +++ b/drivers/power/supply/qcom/smblite-lib.c @@ -1505,7 +1505,7 @@ int smblite_lib_force_vbus_voltage(struct smb_charger *chg, u8 val) } EXPORT_SYMBOL_GPL(smblite_lib_force_vbus_voltage); -static bool is_boost_en(struct smb_charger *chg) +bool smblite_lib_is_boost_en(struct smb_charger *chg) { int rc; u8 stat = 0; @@ -1520,6 +1520,7 @@ static bool is_boost_en(struct smb_charger *chg) return (stat & DCIN_BST_EN_BIT); } +EXPORT_SYMBOL_GPL(smblite_lib_is_boost_en); #define HVDCP3_QUALIFICATION_UV 300000 static int smblite_lib_hvdcp3_force_max_vbus(struct smb_charger *chg) @@ -1534,7 +1535,7 @@ static int smblite_lib_hvdcp3_force_max_vbus(struct smb_charger *chg) mutex_lock(&chg->dpdm_pulse_lock); - boost_en = is_boost_en(chg); + boost_en = smblite_lib_is_boost_en(chg); if (boost_en || chg->hvdcp3_detected) { smblite_lib_dbg(chg, PR_MISC, @@ -1574,7 +1575,7 @@ static int smblite_lib_hvdcp3_force_max_vbus(struct smb_charger *chg) msleep(100); } - if (is_boost_en(chg)) { + if (smblite_lib_is_boost_en(chg)) { smblite_lib_dbg(chg, PR_MISC, "HVDCP3 : Failed to increase vbus due to boost_en\n"); goto failure; @@ -1702,7 +1703,7 @@ int smblite_lib_set_concurrent_config(struct smb_charger *chg, bool enable) int rc = 0, icl_ua = 0, fixed_icl_ua = 0, usb_present = 0; union power_supply_propval pval = {0, }; u8 apsd_status = 0; - bool boost_enabled = is_boost_en(chg); + bool boost_enabled = smblite_lib_is_boost_en(chg); if (!is_concurrent_mode_supported(chg)) { smblite_lib_dbg(chg, PR_MISC, "concurrency-mode: support disabled\n"); @@ -1810,7 +1811,7 @@ int smblite_lib_set_concurrent_config(struct smb_charger *chg, bool enable) * Disable concurrency mode to move back the switcher to * BOOST-mode and wait for SS_DONE for BOOST to settle. */ - boost_enabled = is_boost_en(chg); + boost_enabled = smblite_lib_is_boost_en(chg); smblite_lib_dbg(chg, PR_MISC, "Concurrency failed, Disabling concurrency BOOST_EN=%s - going back to BOOST mode\n", (boost_enabled ? "True" : "False")); @@ -1925,7 +1926,7 @@ int smblite_lib_get_prop_usb_online(struct smb_charger *chg, * while the charger is inserted. */ smblite_lib_is_input_present(chg, &input_present); - if (is_boost_en(chg) && input_present) { + if (smblite_lib_is_boost_en(chg) && input_present) { val->intval = true; smblite_lib_dbg(chg, PR_MISC, "USB_ONLINE set due to boost_en and input_present\n"); @@ -3459,7 +3460,7 @@ static void smblite_lib_handle_hvdcp_check_timeout(struct smb_charger *chg, int rc = 0; /* Stay at 5V if BOOST is enabled */ - if (is_boost_en(chg)) { + if (smblite_lib_is_boost_en(chg)) { smblite_lib_dbg(chg, PR_INTERRUPT, "Ignoring HVDCP3 detect as boost is enabled\n"); return; @@ -4098,7 +4099,7 @@ irqreturn_t smblite_boost_mode_sw_en_irq_handler(int irq, void *data) struct smb_irq_data *irq_data = data; struct smb_charger *chg = irq_data->parent_data; union power_supply_propval pval = {0, }; - bool is_qc = false, boost_enabled = is_boost_en(chg); + bool is_qc = false, boost_enabled = smblite_lib_is_boost_en(chg); u8 apsd_status = 0; int rc = 0; diff --git a/drivers/power/supply/qcom/smblite-lib.h b/drivers/power/supply/qcom/smblite-lib.h index eb654773374b..97adafde98e9 100644 --- a/drivers/power/supply/qcom/smblite-lib.h +++ b/drivers/power/supply/qcom/smblite-lib.h @@ -553,4 +553,5 @@ int smblite_lib_rerun_apsd_if_required(struct smb_charger *chg); int smblite_lib_dm_pulse(struct smb_charger *chg); int smblite_lib_dp_pulse(struct smb_charger *chg); int smblite_lib_force_vbus_voltage(struct smb_charger *chg, u8 val); +bool smblite_lib_is_boost_en(struct smb_charger *chg); #endif /* __SMBLITE_LIB_H */ -- cgit v1.2.3