Skip to content

Commit

Permalink
olpc_battery: Add wakeup support
Browse files Browse the repository at this point in the history
Battery and AC events can now be used to wake up the system from suspend.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
  • Loading branch information
Daniel Drake authored and Anton Vorontsov committed Aug 19, 2011
1 parent c3503fd commit cae659a
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions drivers/power/olpc_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,24 @@ void olpc_battery_trigger_uevent(unsigned long cause)
kobject_uevent(&olpc_bat.dev->kobj, KOBJ_CHANGE);
}

static int olpc_battery_suspend(struct platform_device *pdev,
pm_message_t state)
{
if (device_may_wakeup(olpc_ac.dev))
olpc_ec_wakeup_set(EC_SCI_SRC_ACPWR);
else
olpc_ec_wakeup_clear(EC_SCI_SRC_ACPWR);

if (device_may_wakeup(olpc_bat.dev))
olpc_ec_wakeup_set(EC_SCI_SRC_BATTERY | EC_SCI_SRC_BATSOC
| EC_SCI_SRC_BATERR);
else
olpc_ec_wakeup_clear(EC_SCI_SRC_BATTERY | EC_SCI_SRC_BATSOC
| EC_SCI_SRC_BATERR);

return 0;
}

static int __devinit olpc_battery_probe(struct platform_device *pdev)
{
int ret;
Expand Down Expand Up @@ -578,6 +596,11 @@ static int __devinit olpc_battery_probe(struct platform_device *pdev)
if (ret)
goto error_failed;

if (olpc_ec_wakeup_available()) {
device_set_wakeup_capable(olpc_ac.dev, true);
device_set_wakeup_capable(olpc_bat.dev, true);
}

return 0;

error_failed:
Expand Down Expand Up @@ -612,6 +635,7 @@ static struct platform_driver olpc_battery_drv = {
},
.probe = olpc_battery_probe,
.remove = __devexit_p(olpc_battery_remove),
.suspend = olpc_battery_suspend,
};

static int __init olpc_bat_init(void)
Expand Down

0 comments on commit cae659a

Please sign in to comment.