sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/usb-chipidea'

This commit is contained in:
Sascha Hauer 2014-01-07 11:57:52 +01:00
parent 07e5ba98e5 682d47d6ce
commit dd28a45d9d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/imx/chipidea-imx.c
View File

@ -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;

1
include/usb/chipidea-imx.h
View File

@ -42,7 +42,6 @@ enum imx_usb_mode {
struct imxusb_platformdata {
unsigned long flags;
enum imx_usb_mode mode;
int (*init)(int port);
};
int imx_usbmisc_port_init(int port, unsigned flags);