From 8c77f90820897868c67bb885e28715ec9c89101a Mon Sep 17 00:00:00 2001 From: Wen Xie Date: Fri, 1 Mar 2019 22:35:56 +0800 Subject: [PATCH] power: Add CHARGE_FULL function Samsung patch: Add CHARGE_FULL function. From 6273ea9a561ac14306d2cd7c90d2dda6494f75dd Mon Sep 17 00:00:00 2001 From: Keunho Hwang Date: Fri, 1 Mar 2019 15:47:10 +0900 Subject: [PATCH] [Only-For-Test] driver: power: fix POWER_SUPPLY_PROP_CHARGE_FULL property Signed-off-by: Keunho Hwang Change-Id: I8fa3c449faf95d2cd0560732f49190e215f216cb Signed-off-by: Wen Xie Reviewed-on: https://gerrit.mot.com/1316280 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wei Xu Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- drivers/power/supply/s2mu00x_battery.c | 10 +++++++++- drivers/power/supply/s2mu106_fuelgauge.c | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/s2mu00x_battery.c b/drivers/power/supply/s2mu00x_battery.c index 0ecd3f3dc454..5daccea59703 100644 --- a/drivers/power/supply/s2mu00x_battery.c +++ b/drivers/power/supply/s2mu00x_battery.c @@ -950,7 +950,15 @@ static int s2mu00x_battery_get_property(struct power_supply *psy, val->intval = value.intval; break; case POWER_SUPPLY_PROP_CHARGE_FULL: - val->intval = 3500; + /*Get fuelgauge psy*/ + psy = power_supply_get_by_name(battery->pdata->fuelgauge_name); + if (!psy) + return -EINVAL; + ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL, &value); + if (ret < 0) + pr_err("%s: Fail to execute property\n", __func__); + + val->intval = value.intval; break; case POWER_SUPPLY_PROP_CALIBRATE: val->intval = battery->is_factory; diff --git a/drivers/power/supply/s2mu106_fuelgauge.c b/drivers/power/supply/s2mu106_fuelgauge.c index 455a89d939e2..4aba762dec8e 100755 --- a/drivers/power/supply/s2mu106_fuelgauge.c +++ b/drivers/power/supply/s2mu106_fuelgauge.c @@ -1295,7 +1295,8 @@ static int s2mu106_fg_get_property(struct power_supply *psy, val->intval = fuelgauge->rmc * 1000; break; case POWER_SUPPLY_PROP_CHARGE_FULL: - val->intval = fuelgauge->fcc; + /* Full charged capacity unit is uAh */ + val->intval = fuelgauge->fcc * 1000; break; case POWER_SUPPLY_PROP_ENERGY_NOW: break; -- 2.20.1