From patchwork Wed Jun 19 14:05:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 2749751 Return-Path: X-Original-To: patchwork-linux-omap@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 90A30C0AB1 for ; Wed, 19 Jun 2013 14:07:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44FFA20358 for ; Wed, 19 Jun 2013 14:07:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8AF4C20319 for ; Wed, 19 Jun 2013 14:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934788Ab3FSOGb (ORCPT ); Wed, 19 Jun 2013 10:06:31 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:59616 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933853Ab3FSOG2 (ORCPT ); Wed, 19 Jun 2013 10:06:28 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r5JE63sb028231; Wed, 19 Jun 2013 09:06:03 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r5JE63EX020976; Wed, 19 Jun 2013 09:06:03 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Wed, 19 Jun 2013 09:06:03 -0500 Received: from localhost.localdomain (h56-73.vpn.ti.com [172.24.56.73]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r5JE5t2G021315; Wed, 19 Jun 2013 09:06:01 -0500 From: Roger Quadros To: , CC: , , , , , , Roger Quadros , Samuel Ortiz Subject: [RFC PATCH 2/6] mfd: omap-usb-host: Put pins in IDLE state on suspend Date: Wed, 19 Jun 2013 17:05:49 +0300 Message-ID: <1371650753-11452-3-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1371650753-11452-1-git-send-email-rogerq@ti.com> References: <1371650753-11452-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 In order to support wake up from suspend use the pinctrl framework to put the USB host pins in IDLE state during suspend. CC: Samuel Ortiz Signed-off-by: Roger Quadros --- drivers/mfd/omap-usb-host.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 6601a49..171cc3b 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "omap-usb.h" @@ -111,6 +112,10 @@ struct usbhs_hcd_omap { struct usbhs_omap_platform_data *pdata; u32 usbhs_rev; + + struct pinctrl *pinctrl; + struct pinctrl_state *pins_default; + struct pinctrl_state *pins_idle; }; /*-------------------------------------------------------------------------*/ @@ -325,6 +330,10 @@ static int usbhs_runtime_resume(struct device *dev) dev_dbg(dev, "usbhs_runtime_resume\n"); + if (!IS_ERR(omap->pins_default)) + if (pinctrl_select_state(omap->pinctrl, omap->pins_default)) + dev_err(dev, "Could not select DEFAULT pin state\n"); + omap_tll_enable(pdata); if (!IS_ERR(omap->ehci_logic_fck)) @@ -402,6 +411,10 @@ static int usbhs_runtime_suspend(struct device *dev) omap_tll_disable(pdata); + if (!IS_ERR(omap->pins_idle)) + if (pinctrl_select_state(omap->pinctrl, omap->pins_idle)) + dev_err(dev, "Could not select IDLE pin state\n"); + return 0; } @@ -608,6 +621,30 @@ static int usbhs_omap_probe(struct platform_device *pdev) return -ENOMEM; } + omap->pinctrl = devm_pinctrl_get(dev); + if (!IS_ERR(omap->pinctrl)) { + omap->pins_default = pinctrl_lookup_state(omap->pinctrl, + PINCTRL_STATE_DEFAULT); + if (IS_ERR(omap->pins_default)) + dev_err(dev, "Could not get DEFAULT state pins\n"); + + omap->pins_idle = pinctrl_lookup_state(omap->pinctrl, + PINCTRL_STATE_IDLE); + if (IS_ERR(omap->pins_idle)) + dev_err(dev, "Could not get IDLE state pins\n"); + + } else { + dev_info(dev, "pinctrl_get error\n"); + if (PTR_ERR(omap->pinctrl) == -EPROBE_DEFER) { + dev_info(dev, "defer\n"); + return -EPROBE_DEFER; + } + + omap->pins_default = omap->pins_idle = ERR_PTR(-EINVAL); + dev_dbg(dev, "Proceeding without pinctrl: %ld\n", + PTR_ERR(omap->pinctrl)); + } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); omap->uhh_base = devm_ioremap_resource(dev, res); if (IS_ERR(omap->uhh_base)) @@ -796,6 +833,10 @@ static int usbhs_omap_probe(struct platform_device *pdev) } } + if (!IS_ERR(omap->pins_default)) + if (pinctrl_select_state(omap->pinctrl, omap->pins_default)) + dev_err(dev, "Could not select DEFAULT pin state\n"); + return 0; err_alloc: @@ -872,6 +913,11 @@ static int usbhs_omap_remove(struct platform_device *pdev) /* remove children */ device_for_each_child(&pdev->dev, NULL, usbhs_omap_remove_child); + + if (!IS_ERR(omap->pins_idle)) + if (pinctrl_select_state(omap->pinctrl, omap->pins_idle)) + dev_err(&pdev->dev, "Could not select IDLE pin state\n"); + return 0; }