diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-22 09:09:51 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-22 09:11:36 +0200 |
commit | d963d61c2cfd174225c73b89508a6b876c06ca4b (patch) | |
tree | 81a0be3e37f3f42e5a0601837ad6f01fe81e9c05 /drivers/usb/imx/chipidea-imx.c | |
parent | 12e8ad39b1743bc6156f7640dcf1bec5ac4d5cc8 (diff) | |
download | barebox-d963d61c2cfd174225c73b89508a6b876c06ca4b.tar.gz barebox-d963d61c2cfd174225c73b89508a6b876c06ca4b.tar.xz |
usb: chipidea i.MX: relax phy_type requirements
Some USB ports only have one possiblitly for the phy_type and
the type is not specified in the devicetree in this case.
Rely on the reset default instead of failing.
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 | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c index a7ad7343d8..9b6829b8f5 100644 --- a/drivers/usb/imx/chipidea-imx.c +++ b/drivers/usb/imx/chipidea-imx.c @@ -33,6 +33,7 @@ struct imx_chipidea { unsigned long flags; enum imx_usb_mode mode; int portno; + enum usb_phy_interface phymode; }; static int imx_chipidea_port_init(void *drvdata) @@ -80,7 +81,6 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci) { struct of_phandle_args out_args; enum usb_dr_mode mode; - enum usb_phy_interface phymode; if (of_parse_phandle_with_args(ci->dev->device_node, "fsl,usbmisc", "#index-cells", 0, &out_args)) @@ -101,8 +101,8 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci) break; } - phymode = of_usb_get_phy_mode(ci->dev->device_node, NULL); - switch (phymode) { + ci->phymode = of_usb_get_phy_mode(ci->dev->device_node, NULL); + switch (ci->phymode) { case USBPHY_INTERFACE_MODE_UTMI: ci->flags = MXC_EHCI_MODE_UTMI_8BIT; break; @@ -119,8 +119,7 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci) ci->flags = MXC_EHCI_MODE_HSIC; break; default: - dev_err(ci->dev, "no or invalid phy mode setting\n"); - return -EINVAL; + dev_dbg(ci->dev, "no phy_type setting. Relying on reset default\n"); } if (of_find_property(ci->dev->device_node, @@ -168,10 +167,12 @@ static int imx_chipidea_probe(struct device_d *dev) 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; - portsc |= ci->flags & MXC_EHCI_PORTSC_MASK; - writel(portsc, base + 0x184); + if (ci->phymode != USBPHY_INTERFACE_MODE_UNKNOWN) { + portsc = readl(base + 0x184); + portsc &= ~MXC_EHCI_PORTSC_MASK; + portsc |= ci->flags & MXC_EHCI_PORTSC_MASK; + writel(portsc, base + 0x184); + } ci->data.hccr = base + 0x100; ci->data.hcor = base + 0x140; |