Skip to content

Commit

Permalink
x86, olpc-xo1-sci: Propagate power supply/battery events
Browse files Browse the repository at this point in the history
EC events indicate change in AC power connectivity, battery state of
charge, battery error, battery presence, etc. Send notifications to
the power supply subsystem when changes are detected.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Link: http://lkml.kernel.org/r/1309019658-1712-10-git-send-email-dsd@laptop.org
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Daniel Drake authored and H. Peter Anvin committed Jul 6, 2011
1 parent 2cf2bae commit e1040ac
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
4 changes: 3 additions & 1 deletion arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2082,7 +2082,7 @@ config OLPC_XO1_PM

config OLPC_XO1_SCI
bool "OLPC XO-1 SCI extras"
depends on OLPC && OLPC_XO1_PM
depends on OLPC && OLPC_XO1_PM && POWER_SUPPLY
select GPIO_CS5535
select MFD_CORE
---help---
Expand All @@ -2091,6 +2091,8 @@ config OLPC_XO1_SCI
- Power button
- Ebook switch
- Lid switch
- AC adapter status updates
- Battery status updates

endif # X86_32

Expand Down
37 changes: 37 additions & 0 deletions arch/x86/platform/olpc/olpc-xo1-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <linux/platform_device.h>
#include <linux/pm.h>
#include <linux/mfd/core.h>
#include <linux/power_supply.h>
#include <linux/suspend.h>
#include <linux/workqueue.h>

Expand Down Expand Up @@ -52,6 +53,26 @@ static const char * const lid_wake_mode_names[] = {
[LID_WAKE_CLOSE] = "close",
};

static void battery_status_changed(void)
{
struct power_supply *psy = power_supply_get_by_name("olpc-battery");

if (psy) {
power_supply_changed(psy);
put_device(psy->dev);
}
}

static void ac_status_changed(void)
{
struct power_supply *psy = power_supply_get_by_name("olpc-ac");

if (psy) {
power_supply_changed(psy);
put_device(psy->dev);
}
}

/* Report current ebook switch state through input layer */
static void send_ebook_state(void)
{
Expand Down Expand Up @@ -151,6 +172,18 @@ static void process_sci_queue(bool propagate_events)

pr_debug(PFX "SCI 0x%x received\n", data);

switch (data) {
case EC_SCI_SRC_BATERR:
case EC_SCI_SRC_BATSOC:
case EC_SCI_SRC_BATTERY:
case EC_SCI_SRC_BATCRIT:
battery_status_changed();
break;
case EC_SCI_SRC_ACPWR:
ac_status_changed();
break;
}

if (data == EC_SCI_SRC_EBOOK && propagate_events)
send_ebook_state();
} while (data);
Expand Down Expand Up @@ -240,6 +273,10 @@ static int xo1_sci_resume(struct platform_device *pdev)

/* Enable all EC events */
olpc_ec_mask_write(EC_SCI_SRC_ALL);

/* Power/battery status might have changed too */
battery_status_changed();
ac_status_changed();
return 0;
}

Expand Down

0 comments on commit e1040ac

Please sign in to comment.