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: 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>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 350ccbb4d65074591edaeb8b775ee624d43c371b..a6aefbbc5cbffa6216e003eaa9c158fbf6822b5e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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---
@@ -2091,6 +2091,8 @@ config OLPC_XO1_SCI
           - Power button
           - Ebook switch
           - Lid switch
+          - AC adapter status updates
+          - Battery status updates
 
 endif # X86_32
 

diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index ad0670bca83310d15f6b63a1a9a9400a35f7c7e5..1d4c783d732517751efdd9de28977da44822a96e 100644 (file)
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -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>
 
@@ -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)
 {
@@ -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);
@@ -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;
 }