leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ab8500_charger: Rename the power_loss function

Browse Source 
Rename the ab8500_power_loss_handling function to a more
descriptive name ab8500_enable_disable_sw_fallback

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Reviewed-by: Par-Olof HAKANSSON <par-olof.hakansson@stericsson.com>
Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
Tested-by: Par-Olof HAKANSSON <par-olof.hakansson@stericsson.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
This commit is contained in:
Paer-Olof Haakansson 2013-01-11 13:12:49 +00:00 committed by Anton Vorontsov
parent c4f3422630
commit defbfa9cf8
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/power/ab8500_charger.c
View File

@ -270,20 +270,19 @@ static enum power_supply_property ab8500_charger_usb_props[] = {
POWER_SUPPLY_PROP_CURRENT_NOW,
};
/**
* ab8500_power_loss_handling - set how we handle powerloss.
* @di: pointer to the ab8500_charger structure
*
* Magic nummbers are from STE HW department.
/*
* Function for enabling and disabling sw fallback mode
* should always be disabled when no charger is connected.
*/
static void ab8500_power_loss_handling(struct ab8500_charger *di)
static void ab8500_enable_disable_sw_fallback(struct ab8500_charger *di,
bool fallback)
{
u8 reg;
int ret;
dev_dbg(di->dev, "Autopower : %d\n", di->autopower);
dev_dbg(di->dev, "SW Fallback: %d\n", fallback);
/* read the autopower register */
/* read the register containing fallback bit */
ret = abx500_get_register_interruptible(di->dev, 0x15, 0x00, &reg);
if (ret) {
dev_err(di->dev, "%d write failed\n", __LINE__);
@ -297,12 +296,12 @@ static void ab8500_power_loss_handling(struct ab8500_charger *di)
return;
}
if (di->autopower)
if (fallback)
reg |= 0x8;
else
reg &= ~0x8;
/* write back the changed value to autopower reg */
/* write back the changed fallback bit value to register */
ret = abx500_set_register_interruptible(di->dev, 0x15, 0x00, reg);
if (ret) {
dev_err(di->dev, "%d write failed\n", __LINE__);
@ -332,12 +331,12 @@ static void ab8500_power_supply_changed(struct ab8500_charger *di,
!di->ac.charger_connected &&
di->autopower) {
di->autopower = false;
ab8500_power_loss_handling(di);
ab8500_enable_disable_sw_fallback(di, false);
} else if (!di->autopower &&
(di->ac.charger_connected ||
di->usb.charger_connected)) {
di->autopower = true;
ab8500_power_loss_handling(di);
ab8500_enable_disable_sw_fallback(di, true);
}
}
power_supply_changed(psy);