From 65ea3cf1788afd9501a95d2502a0554bb1d36cbf Mon Sep 17 00:00:00 2001 From: mahj8 Date: Fri, 13 May 2022 15:49:37 +0800 Subject: [PATCH] charging: config batt profile max fv config batt profile max fv for FFC function Change-Id: I5f6200d7bc61525069de73b889dc727b0851449c Signed-off-by: Haijian Ma Reviewed-on: https://gerrit.mot.com/2268183 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 | 5 +++++ drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c | 1 + 2 files changed, 6 insertions(+) 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 c9236211ac31..d5a1ae0b938f 100644 --- a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c +++ b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c @@ -52,7 +52,12 @@ static int mmi_discrete_parse_dts(struct mmi_discrete_charger *chip) struct device_node *node = chip->dev->of_node; rc = of_property_read_u32(node, + "mmi,batt-profile-fv-mv", &chip->batt_profile_fv_uv); + if (rc < 0) { + rc = of_property_read_u32(node, "mmi,max-fv-mv", &chip->batt_profile_fv_uv); + } + if (rc < 0) chip->batt_profile_fv_uv = -EINVAL; else diff --git a/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c index 26d1b5578936..03d112af259b 100644 --- a/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c +++ b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c @@ -343,6 +343,7 @@ static int sgm4154x_set_chrg_volt(struct sgm4154x_device *sgm, int chrg_volt) reg_val = (chrg_volt-SGM4154x_VREG_V_MIN_uV) / SGM4154x_VREG_V_STEP_uV; switch(chrg_volt) { + case 4512000: case 4480000: case 4450000: reg_val++;