aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/ab8500-sysctrl.c
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-08-17 15:58:52 +0200
committerLee Jones <lee.jones@linaro.org>2013-02-04 08:28:44 +0000
commit0903940dcddcaa3f567a1a2308b0c55e2ce0643b (patch)
treeaa0caeaaeb211105560edc2d23e09ec1aff3ad64 /drivers/mfd/ab8500-sysctrl.c
parent7c34d7c2b54818078678a6507ce9a79c3d479243 (diff)
downloadlinux-0903940dcddcaa3f567a1a2308b0c55e2ce0643b.tar.gz
mfd: ab8500-sysctrl: Only reboot into charging mode if battery type is known
When a charger is connected, we usually want AB8500 based systems to reboot into charging-only mode. However, if the battery type cannot be identified this would be futile, so we'll just shut the system down instead. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
Diffstat (limited to 'drivers/mfd/ab8500-sysctrl.c')
-rw-r--r--drivers/mfd/ab8500-sysctrl.c27
1 files changed, 22 insertions, 5 deletions
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index 188d22b77a2..405ca686d9f 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -23,6 +23,10 @@ void ab8500_power_off(void)
sigset_t all;
static char *pss[] = {"ab8500_ac", "ab8500_usb"};
int i;
+ bool charger_present = false;
+ union power_supply_propval val;
+ struct power_supply *psy;
+ int ret;
/*
* If we have a charger connected and we're powering off,
@@ -30,23 +34,36 @@ void ab8500_power_off(void)
*/
for (i = 0; i < ARRAY_SIZE(pss); i++) {
- union power_supply_propval val;
- struct power_supply *psy;
- int ret;
-
psy = power_supply_get_by_name(pss[i]);
if (!psy)
continue;
+
ret = psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &val);
if (!ret && val.intval) {
+ charger_present = true;
+ break;
+ }
+ }
+
+ if (!charger_present)
+ goto shutdown;
+
+ /* Check if battery is known */
+ psy = power_supply_get_by_name("ab8500_btemp");
+ if (psy) {
+ ret = psy->get_property(psy, POWER_SUPPLY_PROP_TECHNOLOGY,
+ &val);
+ if (!ret && val.intval != POWER_SUPPLY_TECHNOLOGY_UNKNOWN) {
printk(KERN_INFO
- "Charger \"%s\" is connected. Rebooting.\n",
+ "Charger \"%s\" is connected with known battery."
+ " Rebooting.\n",
pss[i]);
machine_restart(NULL);
}
}
+shutdown:
sigfillset(&all);
if (!sigprocmask(SIG_BLOCK, &all, &old)) {