redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

smb347-charger: Clean up battery attributes 

CURRENT_NOW and VOLTAGE_NOW should be instantaneous readings
from power supply(ex: battery).

smb347 charger driver reports charge voltage for VOLTAGE_NOW
and charge current for CURRENT_NOW attributes which are not
instantaneous readings.

This patch removes the battery VOLTAGE_NOW and CURRENT_NOW
properties from the driver and also removes hw_to_current()
which is not required anymore.

Signed-off-by: Ramakrishna Pallala <ramakrishna.pallala@intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
hifive-unleashed-5.1
Ramakrishna Pallala 2012-05-05 21:33:54 +05:30 committed by Anton Vorontsov
parent 9a8422d205
commit fcc015cda7
1 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/power/smb347-charger.c
View File

@ -195,14 +195,6 @@ static const unsigned int ccc_tbl[] = {
1200000,
};
/* Convert register value to current using lookup table */
static int hw_to_current(const unsigned int *tbl, size_t size, unsigned int val)
{
if (val >= size)
return -EINVAL;
return tbl[val];
}
/* Convert current to register value using lookup table */
static int current_to_hw(const unsigned int *tbl, size_t size, unsigned int val)
{
@ -891,7 +883,6 @@ static int smb347_battery_get_property(struct power_supply *psy,
struct smb347_charger *smb =
container_of(psy, struct smb347_charger, battery);
const struct smb347_charger_platform_data *pdata = smb->pdata;
unsigned int v;
int ret;
ret = smb347_update_ps_status(smb);
@ -943,44 +934,6 @@ static int smb347_battery_get_property(struct power_supply *psy,
val->intval = pdata->battery_info.voltage_max_design;
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
if (!smb347_is_ps_online(smb))
return -ENODATA;
ret = regmap_read(smb->regmap, STAT_A, &v);
if (ret < 0)
return ret;
v &= STAT_A_FLOAT_VOLTAGE_MASK;
if (v > 0x3d)
v = 0x3d;
val->intval = 3500000 + v * 20000;
break;
case POWER_SUPPLY_PROP_CURRENT_NOW:
if (!smb347_is_ps_online(smb))
return -ENODATA;
ret = regmap_read(smb->regmap, STAT_B, &v);
if (ret < 0)
return ret;
/*
* The current value is composition of FCC and PCC values
* and we can detect which table to use from bit 5.
*/
if (v & 0x20) {
val->intval = hw_to_current(fcc_tbl,
ARRAY_SIZE(fcc_tbl),
v & 7);
} else {
v >>= 3;
val->intval = hw_to_current(pcc_tbl,
ARRAY_SIZE(pcc_tbl),
v & 7);
}
break;
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
val->intval = pdata->battery_info.charge_full_design;
break;
@ -1002,8 +955,6 @@ static enum power_supply_property smb347_battery_properties[] = {
POWER_SUPPLY_PROP_TECHNOLOGY,
POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
POWER_SUPPLY_PROP_VOLTAGE_NOW,
POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
POWER_SUPPLY_PROP_MODEL_NAME,
};