common: Drop linux/delay.h from common header

[oweals/u-boot.git] / drivers / usb / gadget / dwc2_udc_otg.c

diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index b9c814cf73e22832194c8f75b305a54179d62511..eaa5dcb9b138a93e16e9cef66e337ff9ade4917f 100644 (file)
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -21,10 +21,13 @@
 #include <clk.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <log.h>
 #include <malloc.h>
 #include <reset.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
+#include <linux/bug.h>
+#include <linux/delay.h>
 
 #include <linux/errno.h>
 #include <linux/list.h>
@@ -943,8 +946,7 @@ int usb_gadget_handle_interrupts(int index)
 struct dwc2_priv_data {
        struct clk_bulk         clks;
        struct reset_ctl_bulk   resets;
-       struct phy *phys;
-       int num_phys;
+       struct phy_bulk phys;
        struct udevice *usb33d_supply;
 };
 
@@ -953,87 +955,29 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev)
        return dwc2_udc_handle_interrupt();
 }
 
-int dwc2_phy_setup(struct udevice *dev, struct phy **array, int *num_phys)
+static int dwc2_phy_setup(struct udevice *dev, struct phy_bulk *phys)
 {
-       int i, ret, count;
-       struct phy *usb_phys;
-
-       /* Return if no phy declared */
-       if (!dev_read_prop(dev, "phys", NULL))
-               return 0;
-
-       count = dev_count_phandle_with_args(dev, "phys", "#phy-cells");
-       if (count <= 0)
-               return count;
-
-       usb_phys = devm_kcalloc(dev, count, sizeof(struct phy),
-                               GFP_KERNEL);
-       if (!usb_phys)
-               return -ENOMEM;
-
-       for (i = 0; i < count; i++) {
-               ret = generic_phy_get_by_index(dev, i, &usb_phys[i]);
-               if (ret && ret != -ENOENT) {
-                       dev_err(dev, "Failed to get USB PHY%d for %s\n",
-                               i, dev->name);
-                       return ret;
-               }
-       }
-
-       for (i = 0; i < count; i++) {
-               ret = generic_phy_init(&usb_phys[i]);
-               if (ret) {
-                       dev_err(dev, "Can't init USB PHY%d for %s\n",
-                               i, dev->name);
-                       goto phys_init_err;
-               }
-       }
-
-       for (i = 0; i < count; i++) {
-               ret = generic_phy_power_on(&usb_phys[i]);
-               if (ret) {
-                       dev_err(dev, "Can't power USB PHY%d for %s\n",
-                               i, dev->name);
-                       goto phys_poweron_err;
-               }
-       }
-
-       *array = usb_phys;
-       *num_phys =  count;
-
-       return 0;
-
-phys_poweron_err:
-       for (i = count - 1; i >= 0; i--)
-               generic_phy_power_off(&usb_phys[i]);
+       int ret;
 
-       for (i = 0; i < count; i++)
-               generic_phy_exit(&usb_phys[i]);
+       ret = generic_phy_get_bulk(dev, phys);
+       if (ret)
+               return ret;
 
-       return ret;
+       ret = generic_phy_init_bulk(phys);
+       if (ret)
+               return ret;
 
-phys_init_err:
-       for (; i >= 0; i--)
-               generic_phy_exit(&usb_phys[i]);
+       ret = generic_phy_power_on_bulk(phys);
+       if (ret)
+               generic_phy_exit_bulk(phys);
 
        return ret;
 }
 
-void dwc2_phy_shutdown(struct udevice *dev, struct phy *usb_phys, int num_phys)
+static void dwc2_phy_shutdown(struct udevice *dev, struct phy_bulk *phys)
 {
-       int i, ret;
-
-       for (i = 0; i < num_phys; i++) {
-               if (!generic_phy_valid(&usb_phys[i]))
-                       continue;
-
-               ret = generic_phy_power_off(&usb_phys[i]);
-               ret |= generic_phy_exit(&usb_phys[i]);
-               if (ret) {
-                       dev_err(dev, "Can't shutdown USB PHY%d for %s\n",
-                               i, dev->name);
-               }
-       }
+       generic_phy_power_off_bulk(phys);
+       generic_phy_exit_bulk(phys);
 }
 
 static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev)
@@ -1158,7 +1102,7 @@ static int dwc2_udc_otg_probe(struct udevice *dev)
        if (ret)
                return ret;
 
-       ret = dwc2_phy_setup(dev, &priv->phys, &priv->num_phys);
+       ret = dwc2_phy_setup(dev, &priv->phys);
        if (ret)
                return ret;
 
@@ -1208,7 +1152,7 @@ static int dwc2_udc_otg_remove(struct udevice *dev)
 
        clk_release_bulk(&priv->clks);
 
-       dwc2_phy_shutdown(dev, priv->phys, priv->num_phys);
+       dwc2_phy_shutdown(dev, &priv->phys);
 
        return dm_scan_fdt_dev(dev);
 }