github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

power: rk817: fix the display soc jump from 0 to 100

Browse Source 
Change-Id: If930ed4804e502aaa4f6b18a51e671517784ff0b
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
This commit is contained in:
shengfei Xu 2018-03-03 15:36:39 +08:00 committed by Tao Huang
parent f654b33256
commit a6625d7dbb
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/power/rk817_battery.c
View File

@ -101,8 +101,8 @@ module_param_named(dbg_level, dbg_enable, int, 0644);
#define MIN_ZERO_OVERCNT 100
#define MIN_ACCURACY 1
#define DEF_PWRPATH_RES 50
#define WAIT_DSOC_DROP_SEC 15
#define WAIT_SHTD_DROP_SEC 30
#define WAIT_DSOC_DROP_SEC 15
#define WAIT_SHTD_DROP_SEC 30
#define MIN_ZERO_GAP_XSOC1 10
#define MIN_ZERO_GAP_XSOC2 5
#define MIN_ZERO_GAP_XSOC3 3
@ -149,6 +149,7 @@ module_param_named(dbg_level, dbg_enable, int, 0644);
#define TIMER_MS_COUNTS 1000
/* fcc */
#define MIN_FCC 500
#define CAP_INVALID 0x80
/* virtual params */
#define VIRTUAL_CURRENT 1000
@ -1043,16 +1044,23 @@ static int rk817_bat_get_pwron_current(struct rk817_battery_device *battery)
return cur;
}
static bool rk817_bat_remain_cap_is_valid(struct rk817_battery_device *battery)
{
return !(rk817_bat_field_read(battery, Q_PRESS_H3) & CAP_INVALID);
}
static u32 rk817_bat_get_capacity_uah(struct rk817_battery_device *battery)
{
u32 val = 0, capacity;
u32 val = 0, capacity = 0;
val = rk817_bat_field_read(battery, Q_PRESS_H3) << 24;
val |= rk817_bat_field_read(battery, Q_PRESS_H2) << 16;
val |= rk817_bat_field_read(battery, Q_PRESS_L1) << 8;
val |= rk817_bat_field_read(battery, Q_PRESS_L0) << 0;
if (rk817_bat_remain_cap_is_valid(battery)) {
val = rk817_bat_field_read(battery, Q_PRESS_H3) << 24;
val |= rk817_bat_field_read(battery, Q_PRESS_H2) << 16;
val |= rk817_bat_field_read(battery, Q_PRESS_L1) << 8;
val |= rk817_bat_field_read(battery, Q_PRESS_L0) << 0;
capacity = ADC_TO_CAPACITY_UAH(val, battery->res_div);
capacity = ADC_TO_CAPACITY_UAH(val, battery->res_div);
}
DBG("xxxxxxxxxxxxx capacity = %d\n", capacity);
return capacity;
@ -1060,15 +1068,16 @@ static u32 rk817_bat_get_capacity_uah(struct rk817_battery_device *battery)
static u32 rk817_bat_get_capacity_mah(struct rk817_battery_device *battery)
{
u32 val, capacity;
u32 val, capacity = 0;
val = rk817_bat_field_read(battery, Q_PRESS_H3) << 24;
val |= rk817_bat_field_read(battery, Q_PRESS_H2) << 16;
val |= rk817_bat_field_read(battery, Q_PRESS_L1) << 8;
val |= rk817_bat_field_read(battery, Q_PRESS_L0) << 0;
capacity = ADC_TO_CAPACITY(val, battery->res_div);
if (rk817_bat_remain_cap_is_valid(battery)) {
val = rk817_bat_field_read(battery, Q_PRESS_H3) << 24;
val |= rk817_bat_field_read(battery, Q_PRESS_H2) << 16;
val |= rk817_bat_field_read(battery, Q_PRESS_L1) << 8;
val |= rk817_bat_field_read(battery, Q_PRESS_L0) << 0;
capacity = ADC_TO_CAPACITY(val, battery->res_div);
}
DBG("Q_PRESS_H3 = 0x%x\n", rk817_bat_field_read(battery, Q_PRESS_H3));
DBG("Q_PRESS_H2 = 0x%x\n", rk817_bat_field_read(battery, Q_PRESS_H2));
DBG("Q_PRESS_H1 = 0x%x\n", rk817_bat_field_read(battery, Q_PRESS_L1));