@@ -37,6 +37,8 @@ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
struct ci_hdrc *ci = dev_get_drvdata(dev);
int ret = 0;
int port = HCS_N_PORTS(ehci->hcs_params);
+ u32 __iomem *status_reg = &ehci->regs->port_status[portnum];
+ u32 temp = ehci_readl(ehci, status_reg) & ~PORT_RWC_BITS;
if (priv->reg_vbus && enable != priv->enabled) {
if (port > 1) {
@@ -57,6 +59,11 @@ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
priv->enabled = enable;
}
+ if (enable)
+ ehci_writel(ehci, temp | PORT_POWER, status_reg);
+ else
+ ehci_writel(ehci, temp & ~PORT_POWER, status_reg);
+
if (enable && (ci->platdata->phy_mode == USBPHY_INTERFACE_MODE_HSIC)) {
/*
* Marvell 28nm HSIC PHY requires forcing the port to HS mode.
@@ -142,19 +149,8 @@ static int host_start(struct ci_hdrc *ci)
priv = (struct ehci_ci_priv *)ehci->priv;
priv->reg_vbus = NULL;
- if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci)) {
- if (ci->platdata->flags & CI_HDRC_TURN_VBUS_EARLY_ON) {
- 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;
- }
- } else {
- priv->reg_vbus = ci->platdata->reg_vbus;
- }
- }
+ if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci))
+ priv->reg_vbus = ci->platdata->reg_vbus;
if (ci->platdata->pins_host)
pinctrl_select_state(ci->platdata->pctl,
@@ -162,7 +158,7 @@ static int host_start(struct ci_hdrc *ci)
ret = usb_add_hcd(hcd, 0, 0);
if (ret) {
- goto disable_reg;
+ goto put_hcd;
} else {
struct usb_otg *otg = &ci->otg;
@@ -181,10 +177,6 @@ static int host_start(struct ci_hdrc *ci)
return ret;
-disable_reg:
- if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci) &&
- (ci->platdata->flags & CI_HDRC_TURN_VBUS_EARLY_ON))
- regulator_disable(ci->platdata->reg_vbus);
put_hcd:
usb_put_hcd(hcd);
@@ -203,9 +195,6 @@ static void host_stop(struct ci_hdrc *ci)
ci->role = CI_ROLE_END;
synchronize_irq(ci->irq);
usb_put_hcd(hcd);
- if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci) &&
- (ci->platdata->flags & CI_HDRC_TURN_VBUS_EARLY_ON))
- regulator_disable(ci->platdata->reg_vbus);
}
ci->hcd = NULL;
ci->otg.host = NULL;
Commit 659459174188 ("usb: chipidea: host: turn on vbus before add hcd if early vbus on is required") enabled the vbus regulator but didn't assign the reg_vbus. So the vbus regulator can't be disabled anymore. Since the port_power() callback is executed exclusive (without enabling the port power (PP) bit) we can do the special handling within the callback without the need of a special flag. Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> --- drivers/usb/chipidea/host.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)