From 84e1e10a9b76c540198b8246db0bd6a78e7ac718 Mon Sep 17 00:00:00 2001 From: Haijian Ma Date: Mon, 22 Aug 2022 10:36:18 +0800 Subject: [PATCH] Revert "(CR): charging: add icl*vbus to report power max" As qc2.0 detected process will increase vbus to 9V, so icl*vbus=13.5W,so it will report turbo in detected process. So revet it. Mot-CRs-Fixed:(CR) This reverts commit f348d14e72872565376b1b4ad2138f15738c4c14. Change-Id: Ib643f2759fca7139fea4325a40f92b96a0b46b6f Reviewed-on: https://gerrit.mot.com/2367716 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../mmi_discrete_charger/mmi_discrete_charger_core.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c index c514a4857d2e..b161a95dbaf1 100644 --- a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c +++ b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c @@ -2472,7 +2472,6 @@ static int mmi_discrete_get_chg_info(void *data, struct mmi_charger_info *chg_in int rc; int usb_type; int usb_icl; - int vbus; union power_supply_propval val; struct mmi_discrete_chg_client *chg = data; struct mmi_discrete_charger *chip = chg->chip; @@ -2521,13 +2520,8 @@ static int mmi_discrete_get_chg_info(void *data, struct mmi_charger_info *chg_in chip->chg_info.chrg_pmax_mw = 2500; usb_icl = get_effective_result(chip->usb_icl_votable); - val.intval = 0; - rc = get_prop_usb_voltage_now(chip, &val); - if (rc < 0) - mmi_err(chip, "Couldn't read usb voltage rc=%d\n", rc); - vbus = (val.intval /1000 + 500) /1000; - if (chip->chg_info.chrg_pmax_mw < (usb_icl * vbus / 1000)) - chip->chg_info.chrg_pmax_mw = usb_icl * vbus / 1000; + if (chip->chg_info.chrg_pmax_mw < (usb_icl * 5 / 1000)) + chip->chg_info.chrg_pmax_mw = usb_icl * 5 / 1000; rc = 0; goto completed;