From patchwork Tue Dec 23 10:12:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5532121 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1B74ABEEA8 for ; Tue, 23 Dec 2014 10:12:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43B752017D for ; Tue, 23 Dec 2014 10:12:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59321201C8 for ; Tue, 23 Dec 2014 10:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755711AbaLWKM4 (ORCPT ); Tue, 23 Dec 2014 05:12:56 -0500 Received: from mail-pd0-f171.google.com ([209.85.192.171]:33974 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755693AbaLWKM4 (ORCPT ); Tue, 23 Dec 2014 05:12:56 -0500 Received: by mail-pd0-f171.google.com with SMTP id y13so7541124pdi.16 for ; Tue, 23 Dec 2014 02:12:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PaPciJhHDI0ZSX5DKw+gG4sXq60xfFCzM7VnsZeXQa4=; b=hnRj7U73pEYI/iDrh5eTuq0ANMkbFqTHr852HloDSdCYsr7HSehu3MvOYjkCYznzkU s35MPv8aFyZvI04+6YNd5GrPxvJh1aYijvmkFvUIFt+sEPjk1AuHhlrT05vZESZu2EF4 +CPiNgLd6dC5qvKkfLwNRsvwuNpT2VH+Qt9qcLYiy05r8WkRzQtlxy0T4UgsjAObAAk3 9nMbqkWt/z/qKv1TxJqOQsd2xyfm6o+2vDxm6WwrDQcLP5jD7JBOicn4d4LIn6wdsbdx XXuyLVSHKFWNAhqinlbDDZIhL0bdlF0wPHf3kVnGpqlORHXooXCGIsG7CQ1qYyr+XVS3 F3aQ== X-Received: by 10.68.202.1 with SMTP id ke1mr42393505pbc.139.1419329575813; Tue, 23 Dec 2014 02:12:55 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id nr15sm19504693pdb.73.2014.12.23.02.12.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Dec 2014 02:12:55 -0800 (PST) From: Dmitry Eremin-Solenikov To: Sebastian Reichel Cc: linux-pm@vger.kernel.org Subject: [PATCH v2 2/2] power: collie_battery: support generating wakeup event Date: Tue, 23 Dec 2014 13:12:49 +0300 Message-Id: <1419329569-5696-2-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1419329569-5696-1-git-send-email-dbaryshkov@gmail.com> References: <1419329569-5696-1-git-send-email-dbaryshkov@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Teach collie_battery driver to communicate to the kernel that it can generate wakeup events. Handle enabling/disabling wakeup on battery full event in suspend/resume callbacks. Signed-off-by: Dmitry Eremin-Solenikov --- [Changes since V1: fix another possible imbalance.] drivers/power/collie_battery.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c index d02ae02..594e4db 100644 --- a/drivers/power/collie_battery.c +++ b/drivers/power/collie_battery.c @@ -26,6 +26,7 @@ static DEFINE_MUTEX(bat_lock); /* protects gpio pins */ static struct work_struct bat_work; static struct ucb1x00 *ucb; +static int wakeup_enabled; struct collie_bat { int status; @@ -291,11 +292,21 @@ static int collie_bat_suspend(struct ucb1x00_dev *dev) { /* flush all pending status updates */ flush_work(&bat_work); + + if (device_may_wakeup(&dev->ucb->dev) && + collie_bat_main.status == POWER_SUPPLY_STATUS_CHARGING) + wakeup_enabled = !enable_irq_wake(gpio_to_irq(COLLIE_GPIO_CO)); + else + wakeup_enabled = 0; + return 0; } static int collie_bat_resume(struct ucb1x00_dev *dev) { + if (wakeup_enabled) + disable_irq_wake(gpio_to_irq(COLLIE_GPIO_CO)); + /* things may have changed while we were away */ schedule_work(&bat_work); return 0; @@ -334,10 +345,15 @@ static int collie_bat_probe(struct ucb1x00_dev *dev) collie_bat_gpio_isr, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "main full", &collie_bat_main); - if (!ret) { - schedule_work(&bat_work); - return 0; - } + if (ret) + goto err_irq; + + device_init_wakeup(&ucb->dev, 1); + schedule_work(&bat_work); + + return 0; + +err_irq: power_supply_unregister(&collie_bat_bu.psy); err_psy_reg_bu: power_supply_unregister(&collie_bat_main.psy);