From: Patrice Chotard Date: Tue, 18 Jul 2017 09:57:14 +0000 (+0200) Subject: usb: host: ohci-generic: add generic PHY support X-Git-Tag: v2017.09-rc1~32^2~45 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=28df1cfddd9e722d0016d0930b0e523a82737695;p=u-boot usb: host: ohci-generic: add generic PHY support Extend ohci-generic driver with generic PHY framework Signed-off-by: Patrice Chotard Reviewed-by: Simon Glass --- diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index 95d54c1f09..9249039055 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "ohci.h" @@ -19,6 +20,7 @@ struct generic_ohci { ohci_t ohci; struct clk *clocks; /* clock list */ struct reset_ctl *resets; /* reset list */ + struct phy phy; int clock_count; /* number of clock in clock list */ int reset_count; /* number of reset in reset list */ }; @@ -83,12 +85,33 @@ static int ohci_usb_probe(struct udevice *dev) goto clk_err; } + err = generic_phy_get_by_index(dev, 0, &priv->phy); + if (err) { + if (err != -ENOENT) { + error("failed to get usb phy\n"); + goto reset_err; + } + } + + err = generic_phy_init(&priv->phy); + if (err) { + error("failed to init usb phy\n"); + goto reset_err; + } + err = ohci_register(dev, regs); if (err) - goto reset_err; + goto phy_err; return 0; +phy_err: + if (generic_phy_valid(&priv->phy)) { + ret = generic_phy_exit(&priv->phy); + if (ret) + error("failed to release phy\n"); + } + reset_err: ret = reset_release_all(priv->resets, priv->reset_count); if (ret) @@ -110,6 +133,12 @@ static int ohci_usb_remove(struct udevice *dev) if (ret) return ret; + if (generic_phy_valid(&priv->phy)) { + ret = generic_phy_exit(&priv->phy); + if (ret) + return ret; + } + ret = reset_release_all(priv->resets, priv->reset_count); if (ret) return ret;