From 1a0e36fd6bc6229d624c852518a96935b4eaedb7 Mon Sep 17 00:00:00 2001 From: mahj8 Date: Tue, 19 Oct 2021 17:58:39 +0800 Subject: [PATCH] charging: dcp current base on dtsi config in mmi charger dcp_pmax is config in mmi charger dtsi, dcp current setting base on dcp_pmax Change-Id: I7257cb586557bcf24a93ac4f53f5b50339731eb1 Signed-off-by: mahj8 Reviewed-on: https://gerrit.mot.com/2093336 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../power/mmi_discrete_charger/mmi_discrete_charger_core.c | 4 ++-- .../power/mmi_discrete_charger/mmi_discrete_charger_core.h | 1 - 2 files changed, 2 insertions(+), 3 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 01f303ea9838..68ad92199dc9 100644 --- a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c +++ b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c @@ -520,8 +520,8 @@ static int mmi_get_rp_based_dcp_current(struct mmi_discrete_charger *chg, int ty /* fall through */ default: rp_ua = DCP_CURRENT_UA; - if (chg->usb_dcp_curr_max > 0) - rp_ua = chg->usb_dcp_curr_max; + if (chg->constraint.dcp_pmax > 0) + rp_ua = (chg->constraint.dcp_pmax / 5) * 1000; } return rp_ua; diff --git a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.h b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.h index 464c1084b9b9..eecbc60a6e73 100644 --- a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.h +++ b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.h @@ -97,7 +97,6 @@ struct mmi_discrete_charger { bool vbus_enabled; int real_charger_type; - int usb_dcp_curr_max; int hvdcp2_max_icl_ua; /* extcon for VBUS / ID notification to USB for type-c only */