From patchwork Fri Feb 15 12:44:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14860 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 175DF23E2E for ; Fri, 15 Feb 2013 12:46:21 +0000 (UTC) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by fiordland.canonical.com (Postfix) with ESMTP id B12FFA1828F for ; Fri, 15 Feb 2013 12:46:20 +0000 (UTC) Received: by mail-vb0-f44.google.com with SMTP id fr13so2079932vbb.31 for ; Fri, 15 Feb 2013 04:46:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=Go7Khufj5kKJp2kyEM3ionb/8/9iWaD62mXlFHwx6ZE=; b=opCfxVoX8vkr4hZLZTfe9PqkZUi5TvdrMzMDrpww0ld1Q0GXgfvVNBeMZ0/GlG8z/R PrNGeicR6dqqbzJpb1fLjdM2xaxlv/TJfEadTOD4tdTTM6O1xws65ZjrHwJYKPI1rYHL R9ni1fIHoxlK3cjsu18/IRzPPpRmBHLApFdxFlxyZz/lz9lqxGglWBxJlIIchae3roWK RFmWaA6jAltHEho++zrxs59FGewM+HYfVgOxVtj+oQFf3/zgWObdBZZf0MLEjyhQk4qU Q6jL53V3OWmPnGOvidqOMT3WtX1HaQ2sIvK9XUIm4oEX7Mn4GzUhmC1P8drNJ42Io6Cm CuaA== X-Received: by 10.52.33.167 with SMTP id s7mr2510305vdi.52.1360932380138; Fri, 15 Feb 2013 04:46:20 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.221.4.5 with SMTP id oa5csp10856vcb; Fri, 15 Feb 2013 04:46:19 -0800 (PST) X-Received: by 10.180.81.164 with SMTP id b4mr3820656wiy.34.1360932378341; Fri, 15 Feb 2013 04:46:18 -0800 (PST) Received: from mail-we0-x231.google.com ([2a00:1450:400c:c03::231]) by mx.google.com with ESMTPS id c7si1051568wie.1.2013.02.15.04.46.18 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:46:18 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::231 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::231; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::231 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f177.google.com with SMTP id d7so2832169wer.22 for ; Fri, 15 Feb 2013 04:46:18 -0800 (PST) X-Received: by 10.180.85.97 with SMTP id g1mr5705016wiz.29.1360932375258; Fri, 15 Feb 2013 04:46:15 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id bs6sm5133904wib.4.2013.02.15.04.46.12 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:46:14 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, cbouatmailru@gmail.com, sameo@linux.intel.com, Rupesh Kumar , Lee Jones Subject: [PATCH 15/40] pm2301-charger: Wake system when ext charger is plugged-in Date: Fri, 15 Feb 2013 12:44:45 +0000 Message-Id: <1360932310-30065-16-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> References: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl/s6+8l3Mf9FH4btV0p6xHgsIyXotaEUTnVYw/Ia61e70zpqzf3ehGCbX1K8tMB+i5sot5 From: Rupesh Kumar 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 Signed-off-by: Lee Jones Reviewed-by: Philippe LANGLAIS --- drivers/power/pm2301_charger.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index ec51026..7f82431 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -1072,6 +1072,12 @@ static int __devinit 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 __devinit 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 __devinit 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 __devexit 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);