github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wm97xx_battery: Use irq to detect charger state

Browse Source 
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
This commit is contained in:
Marek Vasut 2009-07-23 16:02:08 +02:00 committed by Anton Vorontsov
parent b8bdc1d0cf
commit 7c87942aef
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/power/wm97xx_battery.c
View File

@ -22,6 +22,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irq.h>
static DEFINE_MUTEX(bat_lock); static DEFINE_MUTEX(bat_lock);
static struct work_struct bat_work; static struct work_struct bat_work;
@ -137,6 +138,12 @@ static void wm97xx_bat_work(struct work_struct *work)
wm97xx_bat_update(&bat_ps); wm97xx_bat_update(&bat_ps);
} }
static irqreturn_t wm97xx_chrg_irq(int irq, void *data)
{
schedule_work(&bat_work);
return IRQ_HANDLED;
}
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int wm97xx_bat_suspend(struct platform_device *dev, pm_message_t state) static int wm97xx_bat_suspend(struct platform_device *dev, pm_message_t state)
{ {
@ -179,11 +186,16 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
return -EINVAL; return -EINVAL;
} }
if (pdata->charge_gpio >= 0 && gpio_is_valid(pdata->charge_gpio)) { if (gpio_is_valid(pdata->charge_gpio)) {
ret = gpio_request(pdata->charge_gpio, "BATT CHRG"); ret = gpio_request(pdata->charge_gpio, "BATT CHRG");
if (ret) if (ret)
goto err; goto err;
ret = gpio_direction_input(pdata->charge_gpio); ret = gpio_direction_input(pdata->charge_gpio);
if (ret)
goto err2;
ret = request_irq(gpio_to_irq(pdata->charge_gpio),
wm97xx_chrg_irq, IRQF_DISABLED,
"AC Detect", 0);
if (ret) if (ret)
goto err2; goto err2;
props++; /* POWER_SUPPLY_PROP_STATUS */ props++; /* POWER_SUPPLY_PROP_STATUS */
@ -202,7 +214,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
prop = kzalloc(props * sizeof(*prop), GFP_KERNEL); prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);
if (!prop) if (!prop)
goto err2; goto err3;
prop[i++] = POWER_SUPPLY_PROP_PRESENT; prop[i++] = POWER_SUPPLY_PROP_PRESENT;
if (pdata->charge_gpio >= 0) if (pdata->charge_gpio >= 0)
@ -235,13 +247,17 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
if (!ret) if (!ret)
schedule_work(&bat_work); schedule_work(&bat_work);
else else
goto err3; goto err4;
return 0; return 0;
err3: err4:
kfree(prop); kfree(prop);
err3:
if (gpio_is_valid(pdata->charge_gpio))
free_irq(gpio_to_irq(pdata->charge_gpio), dev);
err2: err2:
gpio_free(pdata->charge_gpio); if (gpio_is_valid(pdata->charge_gpio))
gpio_free(pdata->charge_gpio);
err: err:
return ret; return ret;
} }
@ -251,8 +267,10 @@ static int __devexit wm97xx_bat_remove(struct platform_device *dev)
struct wm97xx_pdata *wmdata = dev->dev.platform_data; struct wm97xx_pdata *wmdata = dev->dev.platform_data;
struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata; struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
if (pdata && pdata->charge_gpio && pdata->charge_gpio >= 0) if (pdata && gpio_is_valid(pdata->charge_gpio)) {
free_irq(gpio_to_irq(pdata->charge_gpio), dev);
gpio_free(pdata->charge_gpio); gpio_free(pdata->charge_gpio);
}
flush_scheduled_work(); flush_scheduled_work();
power_supply_unregister(&bat_ps); power_supply_unregister(&bat_ps);
kfree(prop); kfree(prop);