diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:04 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:04 +0200 |
commit | 33a6e99a38bcb9f1bc698cf85fdc3d900dd30752 (patch) | |
tree | dff4afac4d2e654f9f90269199e3205cbc6d13b1 /drivers/usb/imx/chipidea-imx.c | |
parent | 1e382ad1c4d92b3182c8e19dff2e4b715e2957d2 (diff) | |
parent | 6bfd28dc178fdc5d6342607dc219dc0a6ef00e8e (diff) | |
download | barebox-33a6e99a38bcb9f1bc698cf85fdc3d900dd30752.tar.gz barebox-33a6e99a38bcb9f1bc698cf85fdc3d900dd30752.tar.xz |
Merge branch 'for-next/imx'
Conflicts:
drivers/usb/imx/chipidea-imx.c
Diffstat (limited to 'drivers/usb/imx/chipidea-imx.c')
-rw-r--r-- | drivers/usb/imx/chipidea-imx.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c index 4ee76101f7..80a51b72e8 100644 --- a/drivers/usb/imx/chipidea-imx.c +++ b/drivers/usb/imx/chipidea-imx.c @@ -26,6 +26,7 @@ struct imx_chipidea { struct device_d *dev; + void __iomem *base; struct ehci_data data; unsigned long flags; enum imx_usb_mode mode; @@ -38,6 +39,19 @@ static int imx_chipidea_port_init(void *drvdata) struct imx_chipidea *ci = drvdata; int ret; + if ((ci->flags & MXC_EHCI_PORTSC_MASK) == MXC_EHCI_MODE_ULPI) { + dev_dbg(ci->dev, "using ULPI phy\n"); + if (IS_ENABLED(CONFIG_USB_ULPI)) { + ret = ulpi_setup(ci->base + 0x170, 1); + } else { + dev_err(ci->dev, "no ULPI support available\n"); + ret = -ENODEV; + } + + if (ret) + return ret; + } + ret = imx_usbmisc_port_init(ci->portno, ci->flags); if (ret) dev_err(ci->dev, "misc init failed: %s\n", strerror(-ret)); @@ -144,6 +158,8 @@ static int imx_chipidea_probe(struct device_d *dev) if (!base) return -ENODEV; + ci->base = base; + ci->data.init = imx_chipidea_port_init; ci->data.post_init = imx_chipidea_port_post_init; ci->data.drvdata = ci; @@ -155,19 +171,6 @@ static int imx_chipidea_probe(struct device_d *dev) portsc |= ci->flags & MXC_EHCI_PORTSC_MASK; writel(portsc, base + 0x184); - if ((ci->flags & MXC_EHCI_PORTSC_MASK) == MXC_EHCI_MODE_ULPI) { - dev_dbg(dev, "using ULPI phy\n"); - if (IS_ENABLED(CONFIG_USB_ULPI)) { - ret = ulpi_setup(base + 0x170, 1); - } else { - dev_err(dev, "no ULPI support available\n"); - ret = -ENODEV; - } - - if (ret) - return ret; - } - ci->data.hccr = base + 0x100; ci->data.hcor = base + 0x140; ci->data.flags = EHCI_HAS_TT; |