From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v14 02/12] usb: chipidea: host: add vbus regulator control
Date: Fri, 2 Aug 2013 16:33:55 +0800 [thread overview]
Message-ID: <1375432445-31918-3-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1375432445-31918-1-git-send-email-peter.chen@freescale.com>
For boards which have board level vbus control (eg, through gpio), we
need to vbus operation according to below rules:
- For host, we need open vbus before start hcd, and close it
after remove hcd.
- For otg, the vbus needs to be on/off when usb role switches.
When the host roles begins, it opens vbus; when the host role
finishes, it closes vbus.
We put vbus operation to host as host is the only vbus user,
When we are at host mode, the vbus is on, when we are not at
host mode, vbus should be off.
Tested-by: Marek Vasut <marex@denx.de>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/chipidea/host.c | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 40d0fda..e94e52b 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -24,6 +24,7 @@
#include <linux/usb.h>
#include <linux/usb/hcd.h>
#include <linux/usb/chipidea.h>
+#include <linux/regulator/consumer.h>
#include "../host/ehci.h"
@@ -64,9 +65,19 @@ static int host_start(struct ci_hdrc *ci)
ehci->caps = ci->hw_bank.cap;
ehci->has_hostpc = ci->hw_bank.lpm;
+ if (ci->platdata->reg_vbus) {
+ ret = regulator_enable(ci->platdata->reg_vbus);
+ if (ret) {
+ dev_err(ci->dev,
+ "Failed to enable vbus regulator, ret=%d\n",
+ ret);
+ goto put_hcd;
+ }
+ }
+
ret = usb_add_hcd(hcd, 0, 0);
if (ret)
- usb_put_hcd(hcd);
+ goto disable_reg;
else
ci->hcd = hcd;
@@ -74,6 +85,14 @@ static int host_start(struct ci_hdrc *ci)
hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
return ret;
+
+disable_reg:
+ regulator_disable(ci->platdata->reg_vbus);
+
+put_hcd:
+ usb_put_hcd(hcd);
+
+ return ret;
}
static void host_stop(struct ci_hdrc *ci)
@@ -82,6 +101,8 @@ static void host_stop(struct ci_hdrc *ci)
usb_remove_hcd(hcd);
usb_put_hcd(hcd);
+ if (ci->platdata->reg_vbus)
+ regulator_disable(ci->platdata->reg_vbus);
}
int ci_hdrc_host_init(struct ci_hdrc *ci)
--
1.7.0.4
next prev parent reply other threads:[~2013-08-02 8:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-02 8:33 [PATCH v14 00/12] Add tested id switch and vbus connect detect support for Chipidea Peter Chen
2013-08-02 8:33 ` [PATCH v14 01/12] usb: chipidea: move vbus regulator operation to core Peter Chen
2013-08-02 8:33 ` Peter Chen [this message]
2013-08-02 8:33 ` [PATCH v14 03/12] usb: chipidea: udc: otg_set_peripheral is useless for some chipidea users Peter Chen
2013-08-02 8:33 ` [PATCH v14 04/12] usb: chipidea: otg: Add otg file used to access otgsc Peter Chen
2013-08-09 13:00 ` Alexander Shishkin
2013-08-09 11:18 ` Peter Chen
2013-08-02 8:33 ` [PATCH v14 05/12] usb: chipidea: Add role init and destory APIs Peter Chen
2013-08-02 8:33 ` [PATCH v14 06/12] usb: chipidea: add flag CI_HDRC_DUAL_ROLE_NOT_OTG Peter Chen
2013-08-09 12:55 ` Alexander Shishkin
2013-08-09 11:13 ` Peter Chen
2013-08-09 13:21 ` Alexander Shishkin
2013-08-02 8:34 ` [PATCH v14 07/12] usb: chipidea: disable all interrupts and clear all interrupts status Peter Chen
2013-08-02 8:34 ` [PATCH v14 08/12] usb: chipidea: move otg relate things to otg file Peter Chen
2013-08-09 13:09 ` Alexander Shishkin
2013-08-02 8:34 ` [PATCH v14 09/12] usb: chipidea: add vbus interrupt handler Peter Chen
2013-08-02 8:34 ` [PATCH v14 10/12] usb: chipidea: add wait vbus lower than OTGSC_BSV before role starts Peter Chen
2013-08-02 8:34 ` [PATCH v14 11/12] usb: chipidea: udc: misuse flag CI_HDRC_REGS_SHARED and CI_HDRC_PULLUP_ON_VBUS Peter Chen
2013-08-09 13:23 ` Alexander Shishkin
2013-08-09 11:46 ` Peter Chen
2013-08-09 12:16 ` Peter Chen
2013-08-02 8:34 ` [PATCH v14 12/12] usb: chipidea: udc: .pullup is valid when vbus is on at CI_HDRC_PULLUP_ON_VBUS Peter Chen
2013-08-06 12:00 ` [PATCH v14 00/12] Add tested id switch and vbus connect detect support for Chipidea Peter Chen
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=1375432445-31918-3-git-send-email-peter.chen@freescale.com \
--to=peter.chen@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).