Skip to contentSkip to conversation

usb: ehci-mx6: remove unnecessary regulator enable from probe

PATCH Applied Tim Harvey 2 participants 3 messages May 19, 2023 – Jul 13, 2023

Subsystems (2)
lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

PATCH 1/1 usb: ehci-mx6: remove unnecessary regulator enable from probe

Remove the regulator_set_enable() call from device probe which resolves a regulator imbalance. This is unnecessary as regulator_set_enable() will be called when ehci_register calls the init_after_reset hook.

---
 drivers/usb/host/ehci-mx6.c | 16 ----------------
 1 file changed, 16 deletions(-)
drivers/usb/host/ehci-mx6.c +0 -16
index fae20838c60a..a9ed5e7a0d53 100644
@@ -709,18 +709,6 @@ static int ehci_usb_probe(struct udevice *dev)
 		goto err_regulator;
 #endif
 
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
-	if (priv->vbus_supply) {
-		ret = regulator_set_enable(priv->vbus_supply,
-					   (type == USB_INIT_DEVICE) ?
-					   false : true);
-		if (ret && ret != -ENOSYS) {
-			printf("Error enabling VBUS supply (ret=%i)\n", ret);
-			goto err_clk;
-		}
-	}
-#endif
-
 	if (priv->init_type == USB_INIT_HOST) {
 		setbits_le32(&ehci->usbmode, CM_HOST);
 		writel(mx6_portsc(priv->phy_type), &ehci->portsc);
@@ -744,10 +732,6 @@ err_phy:
 	generic_shutdown_phy(&priv->phy);
 err_regulator:
 #endif
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
-	if (priv->vbus_supply)
-		regulator_set_enable(priv->vbus_supply, false);
-#endif
 err_clk:
 #if CONFIG_IS_ENABLED(CLK)
 	clk_disable(&priv->clk);
Signature · 1 line
2.25.1
author
#1 lore raw
Quoted 47 lines · Tim Harvey

Remove the regulator_set_enable() call from device probe which resolves a regulator imbalance. This is unnecessary as regulator_set_enable() will be called when ehci_register calls the init_after_reset hook.

---
 drivers/usb/host/ehci-mx6.c | 16 ----------------
 1 file changed, 16 deletions(-)
drivers/usb/host/ehci-mx6.c +0 -17
index fae20838c60a..a9ed5e7a0d53 100644
@@ -709,18 +709,6 @@ static int ehci_usb_probe(struct udevice *dev)
                goto err_regulator;
 #endif
 
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
-       if (priv->vbus_supply) {
-               ret = regulator_set_enable(priv->vbus_supply,
-                                          (type == USB_INIT_DEVICE) ?
-                                          false : true);
-               if (ret && ret != -ENOSYS) {
-                       printf("Error enabling VBUS supply (ret=%i)\n", ret);
-                       goto err_clk;
-               }
-       }
-#endif
-
        if (priv->init_type == USB_INIT_HOST) {
                setbits_le32(&ehci->usbmode, CM_HOST);
                writel(mx6_portsc(priv->phy_type), &ehci->portsc);
@@ -744,10 +732,6 @@ err_phy:
        generic_shutdown_phy(&priv->phy);
 err_regulator:
 #endif
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
-       if (priv->vbus_supply)
-               regulator_set_enable(priv->vbus_supply, false);
-#endif
 err_clk:
 #if CONFIG_IS_ENABLED(CLK)
        clk_disable(&priv->clk);
--
Quoted 2 lines

2.25.1

Hi Marek,

I think this goes in your tree. It got delegated to Stefano in patchwork but I'm not sure why as you maintain USB.

best regards,

Tim

Applied
#2 lore raw
Quoted 53 lines · Tim Harvey
Quoted 47 lines · Tim Harvey

Remove the regulator_set_enable() call from device probe which resolves a regulator imbalance. This is unnecessary as regulator_set_enable() will be called when ehci_register calls the init_after_reset hook.

---
  drivers/usb/host/ehci-mx6.c | 16 ----------------
  1 file changed, 16 deletions(-)
drivers/usb/host/ehci-mx6.c +0 -17
index fae20838c60a..a9ed5e7a0d53 100644
@@ -709,18 +709,6 @@ static int ehci_usb_probe(struct udevice *dev)
                 goto err_regulator;
  #endif
 
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
-       if (priv->vbus_supply) {
-               ret = regulator_set_enable(priv->vbus_supply,
-                                          (type == USB_INIT_DEVICE) ?
-                                          false : true);
-               if (ret && ret != -ENOSYS) {
-                       printf("Error enabling VBUS supply (ret=%i)\n", ret);
-                       goto err_clk;
-               }
-       }
-#endif
-
         if (priv->init_type == USB_INIT_HOST) {
                 setbits_le32(&ehci->usbmode, CM_HOST);
                 writel(mx6_portsc(priv->phy_type), &ehci->portsc);
@@ -744,10 +732,6 @@ err_phy:
         generic_shutdown_phy(&priv->phy);
  err_regulator:
  #endif
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
-       if (priv->vbus_supply)
-               regulator_set_enable(priv->vbus_supply, false);
-#endif
  err_clk:
  #if CONFIG_IS_ENABLED(CLK)
         clk_disable(&priv->clk);
--
Quoted 2 lines

2.25.1

Hi Marek,

Quoted 2 lines

I think this goes in your tree. It got delegated to Stefano in patchwork but I'm not sure why as you maintain USB.

Applied to usb/master, thanks for the reminder (I really appreciate that)