diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-11 23:58:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-25 11:52:05 +0200 |
| commit | d9760dc26b0fdfb79b42012624cc2e040576f27e (patch) | |
| tree | 2f956a1b54b5d167882a66a1ac7eccd8c7d8b64e /drivers/usb/imx/chipidea-imx.c | |
| parent | cd79b13b1356149e4bfe743e1d4d54cd919f6861 (diff) | |
| download | barebox-d9760dc26b0fdfb79b42012624cc2e040576f27e.tar.gz barebox-d9760dc26b0fdfb79b42012624cc2e040576f27e.tar.xz | |
usb: i.MX chipidea: probe ULPI phys later
Probe ULPI phys during USB initialization and not during driver
probe. This lowers the pressure to have the necessary board specific
setup in place early.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/imx/chipidea-imx.c')
| -rw-r--r-- | drivers/usb/imx/chipidea-imx.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c index 928ebf31d9..cbdeb14d6e 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; @@ -153,21 +169,6 @@ static int imx_chipidea_probe(struct device_d *dev) portsc |= ci->flags & MXC_EHCI_PORTSC_MASK; writel(portsc, base + 0x184); - imx_chipidea_port_init(ci); - - 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; |