From e9e36e9fcab1e6d9c75d8ecfa87c9b9853fcb679 Mon Sep 17 00:00:00 2001 From: litong20 Date: Wed, 8 Mar 2023 17:23:57 +0800 Subject: [PATCH] ensure that user configuration takes precedence. sc760x: If there is no user configuration, set the value of thermal limit. Change-Id: I0866031ab7f33445846d868d2fa4202c51812185 Reviewed-on: https://gerrit.mot.com/2532545 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Wentao Xu Reviewed-by: Tao Sun Submit-Approved: Jira Key --- drivers/power/sc760x_charger_mmi/sc760x_charger_mmi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/power/sc760x_charger_mmi/sc760x_charger_mmi.c b/drivers/power/sc760x_charger_mmi/sc760x_charger_mmi.c index 5d3d2094e358..33639da317eb 100644 --- a/drivers/power/sc760x_charger_mmi/sc760x_charger_mmi.c +++ b/drivers/power/sc760x_charger_mmi/sc760x_charger_mmi.c @@ -297,6 +297,11 @@ static int sc760x_set_auto_bsm_dis(struct sc760x_chip *sc, bool en) static int sc760x_set_ibat_limit(struct sc760x_chip *sc, int curr) { + if (sc->user_ichg >= 0 && sc->user_ichg != curr) { + curr = sc->user_ichg; + dev_info(sc->dev, "%s : User request override ibat = %duA\n", __func__, curr); + } + dev_info(sc->dev, "%s : %dmA\n", __func__, curr); return sc760x_field_write(sc, IBAT_CHG_LIM, @@ -687,7 +692,7 @@ static int sc760x_set_thermal_mitigation(struct sc760x_chip *sc, int val) if (!sc->num_thermal_levels) return 0; - if (sc->num_thermal_levels < 0 || sc->user_ichg) { + if (sc->num_thermal_levels < 0) { pr_err("Incorrect num_thermal_levels\n"); return -EINVAL; }