Commit e1040ac6 authored by Daniel Drake's avatar Daniel Drake Committed by H. Peter Anvin

x86, olpc-xo1-sci: Propagate power supply/battery events

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: default avatarDaniel Drake <dsd@laptop.org>
Link: http://lkml.kernel.org/r/1309019658-1712-10-git-send-email-dsd@laptop.orgAcked-by: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 2cf2baea
...@@ -2082,7 +2082,7 @@ config OLPC_XO1_PM ...@@ -2082,7 +2082,7 @@ config OLPC_XO1_PM
config OLPC_XO1_SCI config OLPC_XO1_SCI
bool "OLPC XO-1 SCI extras" bool "OLPC XO-1 SCI extras"
depends on OLPC && OLPC_XO1_PM depends on OLPC && OLPC_XO1_PM && POWER_SUPPLY
select GPIO_CS5535 select GPIO_CS5535
select MFD_CORE select MFD_CORE
---help--- ---help---
...@@ -2091,6 +2091,8 @@ config OLPC_XO1_SCI ...@@ -2091,6 +2091,8 @@ config OLPC_XO1_SCI
- Power button - Power button
- Ebook switch - Ebook switch
- Lid switch - Lid switch
- AC adapter status updates
- Battery status updates
endif # X86_32 endif # X86_32
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/power_supply.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
...@@ -52,6 +53,26 @@ static const char * const lid_wake_mode_names[] = { ...@@ -52,6 +53,26 @@ static const char * const lid_wake_mode_names[] = {
[LID_WAKE_CLOSE] = "close", [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 */ /* Report current ebook switch state through input layer */
static void send_ebook_state(void) static void send_ebook_state(void)
{ {
...@@ -151,6 +172,18 @@ static void process_sci_queue(bool propagate_events) ...@@ -151,6 +172,18 @@ static void process_sci_queue(bool propagate_events)
pr_debug(PFX "SCI 0x%x received\n", data); 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) if (data == EC_SCI_SRC_EBOOK && propagate_events)
send_ebook_state(); send_ebook_state();
} while (data); } while (data);
...@@ -240,6 +273,10 @@ static int xo1_sci_resume(struct platform_device *pdev) ...@@ -240,6 +273,10 @@ static int xo1_sci_resume(struct platform_device *pdev)
/* Enable all EC events */ /* Enable all EC events */
olpc_ec_mask_write(EC_SCI_SRC_ALL); olpc_ec_mask_write(EC_SCI_SRC_ALL);
/* Power/battery status might have changed too */
battery_status_changed();
ac_status_changed();
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment