From: Roger Quadros <rogerq@ti.com>
To: stern@rowland.harvard.edu
Cc: gregkh@linuxfoundation.org, balbi@ti.com,
sergei.shtylyov@cogentembedded.com, khilman@linaro.org,
tony@atomide.com, ruslan.bilovol@ti.com,
linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Roger Quadros <rogerq@ti.com>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: [PATCH 4/6] mfd: omap-usb-host: Put pins in IDLE state on suspend
Date: Wed, 10 Jul 2013 19:23:00 +0300 [thread overview]
Message-ID: <1373473380-27515-1-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1373473081-27181-1-git-send-email-rogerq@ti.com>
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 <sameo@linux.intel.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/mfd/omap-usb-host.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index fb2b3d8..3734d16 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -31,6 +31,7 @@
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/err.h>
+#include <linux/pinctrl/consumer.h>
#include "omap-usb.h"
@@ -111,6 +112,7 @@ struct usbhs_hcd_omap {
struct usbhs_omap_platform_data *pdata;
u32 usbhs_rev;
+ bool no_idle;
};
/*-------------------------------------------------------------------------*/
@@ -325,6 +327,7 @@ static int usbhs_runtime_resume(struct device *dev)
dev_dbg(dev, "usbhs_runtime_resume\n");
+ pinctrl_pm_select_default_state(dev);
omap_tll_enable(pdata);
if (!IS_ERR(omap->ehci_logic_fck))
@@ -378,6 +381,12 @@ static int usbhs_runtime_suspend(struct device *dev)
dev_dbg(dev, "usbhs_runtime_suspend\n");
+ if (omap->no_idle) {
+ dev_dbg(dev, "%s: Not suspending as IDLE pins not available\n",
+ __func__);
+ return -EBUSY;
+ }
+
for (i = 0; i < omap->nports; i++) {
switch (pdata->port_mode[i]) {
case OMAP_EHCI_PORT_MODE_HSIC:
@@ -401,6 +410,7 @@ static int usbhs_runtime_suspend(struct device *dev)
clk_disable(omap->ehci_logic_fck);
omap_tll_disable(pdata);
+ pinctrl_pm_select_idle_state(dev);
return 0;
}
@@ -608,6 +618,14 @@ static int usbhs_omap_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ if (!dev->pins || !dev->pins->idle_state) {
+ /* If IDLE pins are not available, we can't remote wakeup,
+ * so prevent idling in that case.
+ */
+ omap->no_idle = true;
+ dev_info(dev, "No IDLE pins so runtime idle disabled\n");
+ }
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
omap->uhh_base = devm_ioremap_resource(dev, res);
if (IS_ERR(omap->uhh_base))
@@ -796,6 +814,8 @@ static int usbhs_omap_probe(struct platform_device *pdev)
}
}
+ pinctrl_pm_select_default_state(dev);
+
return 0;
err_alloc:
@@ -872,6 +892,8 @@ static int usbhs_omap_remove(struct platform_device *pdev)
/* remove children */
device_for_each_child(&pdev->dev, NULL, usbhs_omap_remove_child);
+ pinctrl_pm_select_idle_state(&pdev->dev);
+
return 0;
}
--
1.7.4.1
next prev parent reply other threads:[~2013-07-10 16:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-10 16:17 [PATCH 0/6] USB: Implement runtime idling and remote wakeup for OMAP EHCI controller Roger Quadros
2013-07-10 16:17 ` [PATCH 1/6] ARM: OMAP3: Enable Hardware Save and Restore for USB Host Roger Quadros
2013-07-10 16:22 ` [PATCH 2/6] ARM: dts: omap3beagle-xm: Add idle state pins for USB host Roger Quadros
2013-07-10 16:22 ` [PATCH 3/6] mfd: omap-usb-host: move initialization to module_init() Roger Quadros
2013-07-10 16:23 ` Roger Quadros [this message]
2013-07-14 13:22 ` [PATCH 4/6] mfd: omap-usb-host: Put pins in IDLE state on suspend Kevin Hilman
2013-07-15 8:23 ` Roger Quadros
2013-07-10 16:23 ` [PATCH 5/6] USB: Support wakeup IRQ for suspended controllers Roger Quadros
2013-07-10 18:45 ` Alan Stern
2013-07-11 7:30 ` Roger Quadros
2013-07-10 19:08 ` Alan Stern
2013-07-11 7:30 ` Roger Quadros
2013-07-10 16:23 ` [PATCH 6/6] USB: ehci-omap: Implement suspend/resume Roger Quadros
2013-07-10 19:04 ` Alan Stern
2013-07-11 8:50 ` Roger Quadros
[not found] ` <51DE71F3.1040101-l0cyMroinI0@public.gmane.org>
2013-07-11 15:14 ` Alan Stern
2013-07-22 13:16 ` Roger Quadros
2013-07-22 15:18 ` Alan Stern
2013-07-23 9:18 ` Roger Quadros
2013-07-23 14:14 ` Alan Stern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1373473380-27515-1-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=ruslan.bilovol@ti.com \
--cc=sameo@linux.intel.com \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=stern@rowland.harvard.edu \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox