From patchwork Tue Jul 5 13:08:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 945112 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p65DQLba007603 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 5 Jul 2011 13:26:42 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qe5Za-00044X-Aa; Tue, 05 Jul 2011 13:21:56 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qe5QU-0008Qt-NJ; Tue, 05 Jul 2011 13:12:30 +0000 Received: from mail-fx0-f43.google.com ([209.85.161.43]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qe5Nx-0007X5-2p for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2011 13:09:54 +0000 Received: by mail-fx0-f43.google.com with SMTP id 17so5321658fxg.16 for ; Tue, 05 Jul 2011 06:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=FXxW64Q47t4Ti2rH22km/9A4YmXCesCq4q7eL7br43M=; b=mEnBnTEi9GFHXPz/xs3UfcS8Cei4SRNjTsLOnStOu9FxXMKFSg/HNYnGV7yzE/vHzN RHMVI8CR+owzuUNPMXSJpK2JEkIv4qXAbm8Essb/oCPxFTr1/DL0ge+PXu5hJ7geCSAY j9HjkU49kW5+1QX+2/kMbeBo1SfykbAKN0tmc= Received: by 10.223.83.137 with SMTP id f9mr8807974fal.18.1309871392576; Tue, 05 Jul 2011 06:09:52 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id n20sm1952263fad.16.2011.07.05.06.09.49 (version=SSLv3 cipher=OTHER); Tue, 05 Jul 2011 06:09:51 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org Subject: [PATCH 14/15] gpio-pullup: support disabling D+ pullup on suspend Date: Tue, 5 Jul 2011 17:08:40 +0400 Message-Id: <1309871321-11305-15-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1309871321-11305-1-git-send-email-dbaryshkov@gmail.com> References: <1309871321-11305-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110705_090953_431178_1342B24E X-CRM114-Status: GOOD ( 13.74 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.43 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dbaryshkov[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL To: misformatted and free email service Cc: Greg Kroah-Hartman , Eric Miao , Felipe Balbi X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 05 Jul 2011 13:26:42 +0000 (UTC) As it's done by gpio-vbus, support disabling D+ pullup on suspend to save power. Signed-off-by: Dmitry Eremin-Solenikov --- drivers/usb/otg/gpio_pullup.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/drivers/usb/otg/gpio_pullup.c b/drivers/usb/otg/gpio_pullup.c index 075d269..14c3322 100644 --- a/drivers/usb/otg/gpio_pullup.c +++ b/drivers/usb/otg/gpio_pullup.c @@ -132,10 +132,55 @@ static int __devexit gpio_pullup_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int gpio_pullup_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct gpio_pullup_data *gpio_pullup = platform_get_drvdata(pdev); + struct gpio_vbus_mach_info *pdata = gpio_pullup->dev->platform_data; + + /* optionally disable D+ pullup */ + if (gpio_pullup->otg.gadget && pdata->disconnect_on_suspend) + gpio_set_value(pdata->gpio_pullup, + pdata->gpio_pullup_inverted); + + return 0; +} + +static int gpio_pullup_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct gpio_pullup_data *gpio_pullup = platform_get_drvdata(pdev); + struct gpio_vbus_mach_info *pdata = gpio_pullup->dev->platform_data; + + if (gpio_pullup->otg.gadget) + gpio_set_value(pdata->gpio_pullup, + !pdata->gpio_pullup_inverted); + + return 0; +} +static const struct dev_pm_ops gpio_pullup_pm_ops = { + .suspend_noirq = gpio_pullup_suspend, + .resume_noirq = gpio_pullup_resume, + .freeze_noirq = gpio_pullup_suspend, + .thaw_noirq = gpio_pullup_resume, + .poweroff_noirq = gpio_pullup_suspend, + .restore_noirq = gpio_pullup_resume, +}; +#define GPIO_PULLUP_PM_OPS (&gpio_pullup_pm_ops) +#else +#define GPIO_PULLUP_PM_OPS NULL +#endif + +/* NOTE: the gpio-pullup device may *NOT* be hotplugged */ + +MODULE_ALIAS("platform:gpio-pullup"); + static struct platform_driver gpio_pullup_driver = { .driver = { .name = "gpio-pullup", .owner = THIS_MODULE, + .pm = GPIO_PULLUP_PM_OPS, }, .probe = gpio_pullup_probe, .remove = __devexit_p(gpio_pullup_remove),