diff options
| author | Tom Rini <trini@ti.com> | 2014-02-25 17:44:13 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-25 18:55:49 (GMT) |
| commit | a7e8c15f71456d55ccb27f843862af03a00e0957 (patch) | |
| tree | 67028131161fdded15fd8625aabf3de03cc98b00 /drivers | |
| parent | 4c48cfb58b66924c52cd5c5d960e04cf6d7064ca (diff) | |
| parent | 91d7746df89f858548fe535137b4b185a6a76d59 (diff) | |
| download | u-boot-fsl-qoriq-a7e8c15f71456d55ccb27f843862af03a00e0957.tar.xz | |
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')
| -rw-r--r-- | drivers/net/phy/atheros.c | 1 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-fsl.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c index 994500b..5332e1a 100644 --- a/drivers/net/phy/atheros.c +++ b/drivers/net/phy/atheros.c @@ -13,6 +13,7 @@ static int ar8021_config(struct phy_device *phydev) phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x05); phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x3D47); + phydev->supported = phydev->drv->features; return 0; } diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 45e5d6a..1ca7cf5 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); |