summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorRupesh Kumar <rupesh.kumar@stericsson.com>2012-06-28 15:01:19 +0200
committerLee Jones <lee.jones@linaro.org>2013-03-07 05:35:43 +0100
commitd4f510f6c3f579bac0dbeaa8dc7c2dc768c31786 (patch)
tree3b20ee9b707e4e687ef9f4c2fbd1280eb8150ab1 /drivers/power
parentpm2301-charger: Die temp thermal protection (diff)
downloadlinux-d4f510f6c3f579bac0dbeaa8dc7c2dc768c31786.tar.xz
linux-d4f510f6c3f579bac0dbeaa8dc7c2dc768c31786.zip
pm2301-charger: Wake system when ext charger is plugged-in
When in suspend state, upon plug-in of external AC charger the device needs to wake-up and charging operation started. Signed-off-by: Rupesh Kumar <rupesh.kumar@stericsson.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/pm2301_charger.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index ae647c41c535..b8eafc3850d0 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -1072,6 +1072,12 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
pm2xxx_charger_irq[0].name, pm2->pdata->irq_number, ret);
goto unregister_pm2xxx_charger;
}
+ /* pm interrupt can wake up system */
+ ret = enable_irq_wake(pm2->pdata->irq_number);
+ if (ret) {
+ dev_err(pm2->dev, "failed to set irq wake\n");
+ goto unregister_pm2xxx_interrupt;
+ }
/*Initialize lock*/
mutex_init(&pm2->lock);
@@ -1084,7 +1090,7 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
ret = gpio_request(pm2->lpn_pin, "pm2301_lpm_gpio");
if (ret < 0) {
dev_err(pm2->dev, "pm2301_lpm_gpio request failed\n");
- goto unregister_pm2xxx_charger;
+ goto disable_pm2_irq_wake;
}
ret = gpio_direction_output(pm2->lpn_pin, 0);
if (ret < 0) {
@@ -1115,6 +1121,11 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
free_gpio:
gpio_free(pm2->lpn_pin);
+disable_pm2_irq_wake:
+ disable_irq_wake(pm2->pdata->irq_number);
+unregister_pm2xxx_interrupt:
+ /* disable interrupt */
+ free_irq(pm2->pdata->irq_number, pm2);
unregister_pm2xxx_charger:
/* unregister power supply */
power_supply_unregister(&pm2->ac_chg.psy);
@@ -1125,6 +1136,7 @@ free_charger_wq:
destroy_workqueue(pm2->charger_wq);
free_device_info:
kfree(pm2);
+
return ret;
}
@@ -1135,6 +1147,9 @@ static int pm2xxx_wall_charger_remove(struct i2c_client *i2c_client)
/* Disable AC charging */
pm2xxx_charger_ac_en(&pm2->ac_chg, false, 0, 0);
+ /* Disable wake by pm interrupt */
+ disable_irq_wake(pm2->pdata->irq_number);
+
/* Disable interrupts */
free_irq(pm2->pdata->irq_number, pm2);