From: Roger Quadros <rogerq@ti.com>
To: <stern@rowland.harvard.edu>, <tony@atomide.com>
Cc: <balbi@ti.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: [RFC PATCH 2/6] mfd: omap-usb-host: Put pins in IDLE state on suspend
Date: Wed, 19 Jun 2013 17:05:49 +0300 [thread overview]
Message-ID: <1371650753-11452-3-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1371650753-11452-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 | 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 <linux/of.h>
#include <linux/of_platform.h>
#include <linux/err.h>
+#include <linux/pinctrl/consumer.h>
#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;
}
--
1.7.4.1
next prev parent reply other threads:[~2013-06-19 14:06 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 14:05 [RFC PATCH 0/6] Suspend USB Host controller on bus suspend Roger Quadros
2013-06-19 14:05 ` [RFC PATCH 1/6] mfd: omap-usb-host: move initialization to module_init() Roger Quadros
2013-06-20 12:07 ` Felipe Balbi
2013-06-20 12:29 ` Roger Quadros
2013-06-19 14:05 ` Roger Quadros [this message]
2013-06-19 17:23 ` [RFC PATCH 2/6] mfd: omap-usb-host: Put pins in IDLE state on suspend Kevin Hilman
2013-06-20 7:21 ` Tony Lindgren
2013-06-20 12:30 ` Roger Quadros
2013-06-19 14:05 ` [RFC PATCH 3/6] USB: ehci: allow controller drivers to override irq & bus_suspend/resume Roger Quadros
2013-06-19 14:05 ` [RFC PATCH 4/6] USB: ehci-omap: Suspend the controller during bus suspend Roger Quadros
2013-06-19 17:39 ` Kevin Hilman
2013-06-20 12:32 ` Roger Quadros
2013-06-20 12:11 ` Felipe Balbi
2013-06-20 12:35 ` Roger Quadros
2013-06-20 17:33 ` Alan Stern
2013-06-24 15:09 ` Roger Quadros
2013-06-24 19:34 ` Alan Stern
2013-06-25 13:59 ` Roger Quadros
2013-06-25 17:38 ` Alan Stern
2013-06-26 13:38 ` Roger Quadros
2013-06-27 15:40 ` Alan Stern
2013-06-28 12:20 ` Roger Quadros
2013-06-28 13:57 ` Roger Quadros
2013-06-28 19:18 ` Alan Stern
2013-07-01 8:33 ` Roger Quadros
2013-06-28 19:06 ` Alan Stern
2013-07-01 8:16 ` Roger Quadros
2013-07-01 16:24 ` Alan Stern
2013-07-01 16:49 ` Felipe Balbi
2013-07-01 21:01 ` Alan Stern
2013-07-02 8:22 ` Roger Quadros
2013-07-02 17:17 ` Alan Stern
2013-07-03 9:13 ` Roger Quadros
2013-07-03 12:57 ` Felipe Balbi
2013-07-03 13:06 ` Roger Quadros
2013-07-03 13:15 ` Felipe Balbi
2013-07-03 14:30 ` Alan Stern
2013-07-09 13:58 ` Roger Quadros
2013-06-19 14:05 ` [RFC PATCH 5/6] ARM: dts: omap3beagle-xm: Add idle state pins for USB host Roger Quadros
2013-06-19 18:42 ` Kevin Hilman
2013-06-20 11:55 ` Roger Quadros
2013-06-20 12:02 ` Roger Quadros
2013-06-20 13:02 ` Roger Quadros
2013-06-19 14:05 ` [RFC PATCH 6/6] ARM: OMAP3: Enable Hardware Save and Restore for USB Host Roger Quadros
2013-06-19 17:30 ` Sergei Shtylyov
2013-06-20 12:42 ` Roger Quadros
2013-06-19 15:23 ` [RFC PATCH 0/6] Suspend USB Host controller on bus suspend Alan Stern
2013-06-20 12:39 ` Roger Quadros
2013-06-20 17:19 ` 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=1371650753-11452-3-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--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=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
Powered by JetHome