]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
usb: ohci: Make usage of generic_{setup,shutdown}_phy() helpers
authorPatrice Chotard <patrice.chotard@foss.st.com>
Tue, 6 Sep 2022 06:15:27 +0000 (08:15 +0200)
committerMarek Vasut <marex@denx.de>
Mon, 10 Oct 2022 16:08:18 +0000 (18:08 +0200)
Replace ohci_setup_phy() and ohci_shutdown_phy () by respectively
generic_setup_phy() and generic_shutdown_phy().

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
drivers/usb/host/ohci-generic.c

index 5d23058aaf6acdc65aa703cd1e7ddc2251d4ac58..2d8d38ce9a40e22872e5c64ddad11afe19ffc114 100644 (file)
@@ -23,56 +23,6 @@ struct generic_ohci {
        int reset_count;        /* number of reset in reset list */
 };
 
-static int ohci_setup_phy(struct udevice *dev, int index)
-{
-       struct generic_ohci *priv = dev_get_priv(dev);
-       int ret;
-
-       ret = generic_phy_get_by_index(dev, index, &priv->phy);
-       if (ret) {
-               if (ret != -ENOENT) {
-                       dev_err(dev, "failed to get usb phy\n");
-                       return ret;
-               }
-       } else {
-               ret = generic_phy_init(&priv->phy);
-               if (ret) {
-                       dev_dbg(dev, "failed to init usb phy\n");
-                       return ret;
-               }
-
-               ret = generic_phy_power_on(&priv->phy);
-               if (ret) {
-                       dev_dbg(dev, "failed to power on usb phy\n");
-                       return generic_phy_exit(&priv->phy);
-               }
-       }
-
-       return 0;
-}
-
-static int ohci_shutdown_phy(struct udevice *dev)
-{
-       struct generic_ohci *priv = dev_get_priv(dev);
-       int ret = 0;
-
-       if (generic_phy_valid(&priv->phy)) {
-               ret = generic_phy_power_off(&priv->phy);
-               if (ret) {
-                       dev_dbg(dev, "failed to power off usb phy\n");
-                       return ret;
-               }
-
-               ret = generic_phy_exit(&priv->phy);
-               if (ret) {
-                       dev_dbg(dev, "failed to power off usb phy\n");
-                       return ret;
-               }
-       }
-
-       return 0;
-}
-
 static int ohci_usb_probe(struct udevice *dev)
 {
        struct ohci_regs *regs = dev_read_addr_ptr(dev);
@@ -135,7 +85,7 @@ static int ohci_usb_probe(struct udevice *dev)
                goto clk_err;
        }
 
-       err = ohci_setup_phy(dev, 0);
+       err = generic_setup_phy(dev, &priv->phy, 0);
        if (err)
                goto reset_err;
 
@@ -146,7 +96,7 @@ static int ohci_usb_probe(struct udevice *dev)
        return 0;
 
 phy_err:
-       ret = ohci_shutdown_phy(dev);
+       ret = generic_shutdown_phy(&priv->phy);
        if (ret)
                dev_err(dev, "failed to shutdown usb phy\n");
 
@@ -171,7 +121,7 @@ static int ohci_usb_remove(struct udevice *dev)
        if (ret)
                return ret;
 
-       ret = ohci_shutdown_phy(dev);
+       ret = generic_shutdown_phy(&priv->phy);
        if (ret)
                return ret;