提交 40ed51a4 编写于 作者: P Peter Chen 提交者: Greg Kroah-Hartman

usb: chipidea: host: add vbus regulator control

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: NMarek Vasut <marex@denx.de>
Signed-off-by: NPeter Chen <peter.chen@freescale.com>
Signed-off-by: NAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 1542d9c3
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
#include <linux/usb/chipidea.h> #include <linux/usb/chipidea.h>
#include <linux/regulator/consumer.h>
#include "../host/ehci.h" #include "../host/ehci.h"
...@@ -65,9 +66,19 @@ static int host_start(struct ci_hdrc *ci) ...@@ -65,9 +66,19 @@ static int host_start(struct ci_hdrc *ci)
ehci->has_hostpc = ci->hw_bank.lpm; ehci->has_hostpc = ci->hw_bank.lpm;
ehci->has_tdi_phy_lpm = ci->hw_bank.lpm; ehci->has_tdi_phy_lpm = 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); ret = usb_add_hcd(hcd, 0, 0);
if (ret) if (ret)
usb_put_hcd(hcd); goto disable_reg;
else else
ci->hcd = hcd; ci->hcd = hcd;
...@@ -75,6 +86,14 @@ static int host_start(struct ci_hdrc *ci) ...@@ -75,6 +86,14 @@ static int host_start(struct ci_hdrc *ci)
hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS); hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
return ret; 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) static void host_stop(struct ci_hdrc *ci)
...@@ -83,6 +102,8 @@ static void host_stop(struct ci_hdrc *ci) ...@@ -83,6 +102,8 @@ static void host_stop(struct ci_hdrc *ci)
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
usb_put_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) int ci_hdrc_host_init(struct ci_hdrc *ci)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册