summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-02-25 12:44:13 -0500
committerTom Rini <trini@ti.com>2014-02-25 13:55:49 -0500
commita7e8c15f71456d55ccb27f843862af03a00e0957 (patch)
tree67028131161fdded15fd8625aabf3de03cc98b00 /drivers/usb/host
parent4c48cfb58b66924c52cd5c5d960e04cf6d7064ca (diff)
parent91d7746df89f858548fe535137b4b185a6a76d59 (diff)
downloadtalos-obmc-uboot-a7e8c15f71456d55ccb27f843862af03a00e0957.tar.gz
talos-obmc-uboot-a7e8c15f71456d55ccb27f843862af03a00e0957.zip
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
With this, fixup a trivial build error of get_effective_memsize needing to be updated in the new board/freescale/p1010rdb/spl.c Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-fsl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 45e5d6a5bd..1ca7cf5d9b 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -86,7 +86,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
#endif
}
- if (!strcmp(phy_type, "utmi")) {
+ if (!strncmp(phy_type, "utmi", 4)) {
#if defined(CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY)
setbits_be32(&ehci->control, PHY_CLK_SEL_UTMI);
setbits_be32(&ehci->control, UTMI_PHY_EN);
OpenPOWER on IntegriCloud