diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:52 +0100 |
| commit | dd28a45d9defb7fcdd221134def588bf811a4fb1 (patch) | |
| tree | ab51bd5055ff84ec1e486bac0b41f226e87a6381 /drivers | |
| parent | 07e5ba98e5f027685b3aea02e634ec0611a8f6fe (diff) | |
| parent | 682d47d6ce1451ff070737975552ece613056eaa (diff) | |
| download | barebox-dd28a45d9defb7fcdd221134def588bf811a4fb1.tar.gz barebox-dd28a45d9defb7fcdd221134def588bf811a4fb1.tar.xz | |
Merge branch 'for-next/usb-chipidea'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/imx/chipidea-imx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c index d8209d174b..a7ad7343d8 100644 --- a/drivers/usb/imx/chipidea-imx.c +++ b/drivers/usb/imx/chipidea-imx.c @@ -32,7 +32,6 @@ struct imx_chipidea { struct ehci_data data; unsigned long flags; enum imx_usb_mode mode; - int (*init)(int port); int portno; }; @@ -45,6 +44,10 @@ static int imx_chipidea_port_init(void *drvdata) dev_dbg(ci->dev, "using ULPI phy\n"); if (IS_ENABLED(CONFIG_USB_ULPI)) { ret = ulpi_setup(ci->base + 0x170, 1); + if (ret) + dev_err(ci->dev, "ULPI setup failed with %s\n", + strerror(-ret)); + mdelay(20); } else { dev_err(ci->dev, "no ULPI support available\n"); ret = -ENODEV; @@ -58,9 +61,6 @@ static int imx_chipidea_port_init(void *drvdata) if (ret) dev_err(ci->dev, "misc init failed: %s\n", strerror(-ret)); - if (ci->init) - ci->init(ci->portno); - return ret; } @@ -152,7 +152,6 @@ static int imx_chipidea_probe(struct device_d *dev) } ci->portno = dev->id; ci->flags = pdata->flags; - ci->init = pdata->init; ci->mode = pdata->mode; } @@ -166,7 +165,8 @@ static int imx_chipidea_probe(struct device_d *dev) ci->data.post_init = imx_chipidea_port_post_init; ci->data.drvdata = ci; - imx_chipidea_port_init(ci); + if ((ci->flags & MXC_EHCI_PORTSC_MASK) == MXC_EHCI_MODE_HSIC) + imx_chipidea_port_init(ci); portsc = readl(base + 0x184); portsc &= ~MXC_EHCI_PORTSC_MASK; |