From 43becf667792427f2c566e966459df00f01941ab Mon Sep 17 00:00:00 2001 From: Haijian Ma Date: Mon, 22 Aug 2022 10:31:24 +0800 Subject: [PATCH] Revert "(CR): modules: vision station WHITE MASK test failed" As qc2.0 detected process will increase vbus to 9V, so icl*vbus=13.5W, so it will report turbo charger in detected process, so revert it. Mot-CRs-Fixed:(CR) This reverts commit 8c22d82f275e606fd1e508181265cf5e05a665fe. Change-Id: I0a553d2118df5da06dc339c110f1c5d5da435334 Reviewed-on: https://gerrit.mot.com/2367715 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../power/mmi_discrete_charger/mmi_discrete_charger_core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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 2551c1ddea77..c514a4857d2e 100644 --- a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c +++ b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c @@ -2526,10 +2526,8 @@ static int mmi_discrete_get_chg_info(void *data, struct mmi_charger_info *chg_in if (rc < 0) mmi_err(chip, "Couldn't read usb voltage rc=%d\n", rc); vbus = (val.intval /1000 + 500) /1000; - if ((usb_type != POWER_SUPPLY_TYPE_USB) && (usb_type != POWER_SUPPLY_TYPE_USB_CDP)) { - 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 * vbus / 1000)) + chip->chg_info.chrg_pmax_mw = usb_icl * vbus / 1000; rc = 0; goto completed;