[ARM] pxa/raumfeld: Check charge state after resume
authorDaniel Mack <daniel@caiaq.de>
Mon, 31 May 2010 14:02:32 +0000 (16:02 +0200)
committerEric Miao <eric.y.miao@gmail.com>
Fri, 18 Jun 2010 07:07:35 +0000 (15:07 +0800)
Use the resume callback of the pda_power supply framework to check for a
'charge finished' event that might have occured during the sleep phase.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
arch/arm/mach-pxa/raumfeld.c

index d4b61b3f08f3e851969a0215e634da86b455e80c..67e04f4e07c122781e42ca184c30f1e7b4329e7e 100644 (file)
@@ -745,13 +745,32 @@ static int raumfeld_is_usb_online(void)
 
 static char *raumfeld_power_supplicants[] = { "ds2760-battery.0" };
 
+static void raumfeld_power_signal_charged(void)
+{
+       struct power_supply *psy =
+               power_supply_get_by_name(raumfeld_power_supplicants[0]);
+
+       if (psy)
+               power_supply_set_battery_charged(psy);
+}
+
+static int raumfeld_power_resume(void)
+{
+       /* check if GPIO_CHARGE_DONE went low while we were sleeping */
+       if (!gpio_get_value(GPIO_CHARGE_DONE))
+               raumfeld_power_signal_charged();
+
+       return 0;
+}
+
 static struct pda_power_pdata power_supply_info = {
        .init                   = power_supply_init,
        .is_ac_online           = raumfeld_is_ac_online,
        .is_usb_online          = raumfeld_is_usb_online,
        .exit                   = power_supply_exit,
        .supplied_to            = raumfeld_power_supplicants,
-       .num_supplicants        = ARRAY_SIZE(raumfeld_power_supplicants)
+       .num_supplicants        = ARRAY_SIZE(raumfeld_power_supplicants),
+       .resume                 = raumfeld_power_resume,
 };
 
 static struct resource power_supply_resources[] = {
@@ -766,13 +785,7 @@ static struct resource power_supply_resources[] = {
 
 static irqreturn_t charge_done_irq(int irq, void *dev_id)
 {
-       struct power_supply *psy;
-
-       psy = power_supply_get_by_name("ds2760-battery.0");
-
-       if (psy)
-               power_supply_set_battery_charged(psy);
-
+       raumfeld_power_signal_charged();
        return IRQ_HANDLED;
 }