From: Patrice Chotard patrice.chotard@st.com

phy->dev need to be set to NULL in case of generic_phy_get_by_index() fails. Then phy->dev can be used to check if the phy is valid

Reported-by: Jean-Jacques Hiblot jjhiblot@ti.com Signed-off-by: Patrice Chotard patrice.chotard@st.com Reviewed-by: Simon Glass sjg@chromium.org ---

v8: _ none v7: _ none v6: _ none v5: _ none v4: _ ensure that phy->dev is set to NULL in case of generic_phy_get_by_index() fails

drivers/phy/phy-uclass.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c index d8b8d58..68e518f 100644 --- a/drivers/phy/phy-uclass.c +++ b/drivers/phy/phy-uclass.c @@ -45,6 +45,7 @@ int generic_phy_get_by_index(struct udevice *dev, int index, debug("%s(dev=%p, index=%d, phy=%p)\n", __func__, dev, index, phy);

assert(phy); + phy->dev = NULL; ret = dev_read_phandle_with_args(dev, "phys", "#phy-cells", 0, index, &args); if (ret) {

From: Patrice Chotard patrice.chotard@st.com

To avoid compilation breakage on platform that doesn't support DM PHY but uses xhci-dwc3 driver, add PHY stub functions.

Cc: Ran Wang ran.wang_1@nxp.com Cc: Bin Meng bmeng.cn@gmail.com

Signed-off-by: Patrice Chotard patrice.chotard@st.com ---

v8: _ add genric PHY stub functions to avoid compilation issue for platforms which uses xhci-dwc3 driver and doesn't support generic PHY framework

include/generic-phy.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)

diff --git a/include/generic-phy.h b/include/generic-phy.h index 58cd2b2..eac5adc 100644 --- a/include/generic-phy.h +++ b/include/generic-phy.h @@ -122,6 +122,7 @@ struct phy_ops { int (*power_off)(struct phy *phy); };

+#ifdef CONFIG_PHY

/** * generic_phy_init() - initialize the PHY port @@ -220,6 +221,47 @@ int generic_phy_get_by_index(struct udevice *user, int index, int generic_phy_get_by_name(struct udevice *user, const char *phy_name, struct phy *phy);

+#else /* CONFIG_PHY */ + +static inline int generic_phy_init(struct phy *phy) +{ + return 0; +} + +static inline int generic_phy_exit(struct phy *phy) +{ + return 0; +} + +static inline int generic_phy_reset(struct phy *phy) +{ + return 0; +} + +static inline int generic_phy_power_on(struct phy *phy) +{ + return 0; +} + +static inline int generic_phy_power_off(struct phy *phy) +{ + return 0; +} + +static inline int generic_phy_get_by_index(struct udevice *user, int index, + struct phy *phy) +{ + return 0; +} + +static inline int generic_phy_get_by_name(struct udevice *user, const char *phy_name, + struct phy *phy) +{ + return 0; +} + +#endif /* CONFIG_PHY */ + /** * generic_phy_valid() - check if PHY port is valid *

From: Patrice Chotard patrice.chotard@st.com

Add support of generic PHY framework support

Signed-off-by: Patrice Chotard patrice.chotard@st.com ---

v8: _ fix bisection issue with patch 1 reported by Łukasz Majewski, move struct xhci_dwc3_platdata in this patch to fix it. v7: _ none v6: _ none v5: _ none v4: _ none v3: _ use generic_phy_valid() method v2: _ none

drivers/usb/host/xhci-dwc3.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)

diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index cab0c2a..4b2fe71 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -10,6 +10,8 @@

#include <common.h> #include <dm.h> +#include <fdtdec.h> +#include <generic-phy.h> #include <usb.h>

#include "xhci.h" @@ -19,6 +21,10 @@

DECLARE_GLOBAL_DATA_PTR;

+struct xhci_dwc3_platdata { + struct phy usb_phy; +}; + void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode) { clrsetbits_le32(&dwc3_reg->g_ctl, @@ -108,15 +114,31 @@ void dwc3_set_fladj(struct dwc3 *dwc3_reg, u32 val) #ifdef CONFIG_DM_USB static int xhci_dwc3_probe(struct udevice *dev) { + struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); struct xhci_hcor *hcor; struct xhci_hccr *hccr; struct dwc3 *dwc3_reg; enum usb_dr_mode dr_mode; + int ret;

hccr = (struct xhci_hccr *)devfdt_get_addr(dev); hcor = (struct xhci_hcor *)((phys_addr_t)hccr + HC_LENGTH(xhci_readl(&(hccr)->cr_capbase)));

+ ret = generic_phy_get_by_index(dev, 0, &plat->usb_phy); + if (ret) { + if (ret != -ENOENT) { + error("Failed to get USB PHY for %s\n", dev->name); + return ret; + } + } else { + ret = generic_phy_init(&plat->usb_phy); + if (ret) { + error("Can't init USB PHY for %s\n", dev->name); + return ret; + } + } + dwc3_reg = (struct dwc3 *)((char *)(hccr) + DWC3_REG_OFFSET);

dwc3_core_init(dwc3_reg); @@ -133,6 +155,17 @@ static int xhci_dwc3_probe(struct udevice *dev)

static int xhci_dwc3_remove(struct udevice *dev) { + struct xhci_dwc3_platdata *plat = dev_get_platdata(dev); + int ret; + + if (generic_phy_valid(&plat->usb_phy)) { + ret = generic_phy_exit(&plat->usb_phy); + if (ret) { + error("Can't deinit USB PHY for %s\n", dev->name); + return ret; + } + } + return xhci_deregister(dev); }

@@ -149,6 +182,7 @@ U_BOOT_DRIVER(xhci_dwc3) = { .remove = xhci_dwc3_remove, .ops = &xhci_usb_ops, .priv_auto_alloc_size = sizeof(struct xhci_ctrl), + .platdata_auto_alloc_size = sizeof(struct xhci_dwc3_platdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif