mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-27 23:20:26 +09:00
usb: ehci-mx6: Add generic EHCI PHY support
In case PHY support is enabled, use the generic EHCI PHY support to start and stop the PHY. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Ye Li <ye.li@nxp.com> Cc: uboot-imx <uboot-imx@nxp.com>
This commit is contained in:
parent
6443a3bc40
commit
50d0146cb7
@ -425,6 +425,7 @@ struct ehci_mx6_priv_data {
|
|||||||
struct usb_ehci *ehci;
|
struct usb_ehci *ehci;
|
||||||
struct udevice *vbus_supply;
|
struct udevice *vbus_supply;
|
||||||
struct clk clk;
|
struct clk clk;
|
||||||
|
struct phy phy;
|
||||||
enum usb_init_type init_type;
|
enum usb_init_type init_type;
|
||||||
int portnr;
|
int portnr;
|
||||||
void __iomem *phy_addr;
|
void __iomem *phy_addr;
|
||||||
@ -684,22 +685,32 @@ static int ehci_usb_probe(struct udevice *dev)
|
|||||||
|
|
||||||
mdelay(10);
|
mdelay(10);
|
||||||
|
|
||||||
|
#if defined(CONFIG_PHY)
|
||||||
|
ret = ehci_setup_phy(dev, &priv->phy, 0);
|
||||||
|
if (ret)
|
||||||
|
goto err_regulator;
|
||||||
|
#endif
|
||||||
|
|
||||||
hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
|
hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
|
||||||
hcor = (struct ehci_hcor *)((uint32_t)hccr +
|
hcor = (struct ehci_hcor *)((uint32_t)hccr +
|
||||||
HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
|
HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
|
||||||
|
|
||||||
ret = ehci_register(dev, hccr, hcor, &mx6_ehci_ops, 0, priv->init_type);
|
ret = ehci_register(dev, hccr, hcor, &mx6_ehci_ops, 0, priv->init_type);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_regulator;
|
goto err_phy;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
err_phy:
|
||||||
|
#if defined(CONFIG_PHY)
|
||||||
|
ehci_shutdown_phy(dev, &priv->phy);
|
||||||
err_regulator:
|
err_regulator:
|
||||||
|
#endif
|
||||||
#if CONFIG_IS_ENABLED(DM_REGULATOR)
|
#if CONFIG_IS_ENABLED(DM_REGULATOR)
|
||||||
if (priv->vbus_supply)
|
if (priv->vbus_supply)
|
||||||
regulator_set_enable(priv->vbus_supply, false);
|
regulator_set_enable(priv->vbus_supply, false);
|
||||||
#endif
|
|
||||||
err_clk:
|
err_clk:
|
||||||
|
#endif
|
||||||
#if CONFIG_IS_ENABLED(CLK)
|
#if CONFIG_IS_ENABLED(CLK)
|
||||||
clk_disable(&priv->clk);
|
clk_disable(&priv->clk);
|
||||||
#else
|
#else
|
||||||
@ -715,6 +726,10 @@ int ehci_usb_remove(struct udevice *dev)
|
|||||||
|
|
||||||
ehci_deregister(dev);
|
ehci_deregister(dev);
|
||||||
|
|
||||||
|
#if defined(CONFIG_PHY)
|
||||||
|
ehci_shutdown_phy(dev, &priv->phy);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if CONFIG_IS_ENABLED(DM_REGULATOR)
|
#if CONFIG_IS_ENABLED(DM_REGULATOR)
|
||||||
if (priv->vbus_supply)
|
if (priv->vbus_supply)
|
||||||
regulator_set_enable(priv->vbus_supply, false);
|
regulator_set_enable(priv->vbus_supply, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user