diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-24 21:17:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-24 21:17:49 -0400 |
| commit | 0e1819f2fb3c6089cd74fb5d9eb99d1184887366 (patch) | |
| tree | 48849f10fe3a63b1bc8e75a917b996fe438c33c6 | |
| parent | fcf3981161140d265b873a5b609b8867328dc9dc (diff) | |
| parent | 4822114f4fb4328114da8ab199672656591a150d (diff) | |
| download | u-boot-0e1819f2fb3c6089cd74fb5d9eb99d1184887366.zip u-boot-0e1819f2fb3c6089cd74fb5d9eb99d1184887366.tar.gz u-boot-0e1819f2fb3c6089cd74fb5d9eb99d1184887366.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
- A few easy MX7 EHCI USB fixes, for this release.
| -rw-r--r-- | drivers/usb/host/ehci-mx6.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 238c931..c3e4170 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -569,7 +569,6 @@ static int mx6_parse_dt_addrs(struct udevice *dev) const void *blob = gd->fdt_blob; int offset = dev_of_offset(dev); void *__iomem addr; - int ret, devnump; phy_off = fdtdec_lookup_phandle(blob, offset, "fsl,usbphy"); if (phy_off < 0) { @@ -578,21 +577,15 @@ static int mx6_parse_dt_addrs(struct udevice *dev) return -EINVAL; } - ret = fdtdec_get_alias_seq(blob, dev->uclass->uc_drv->name, - phy_off, &devnump); - if (ret < 0) - return ret; - misc_off = fdtdec_lookup_phandle(blob, offset, "fsl,usbmisc"); if (misc_off < 0) return -EINVAL; addr = (void __iomem *)fdtdec_get_addr(blob, phy_off, "reg"); if ((fdt_addr_t)addr == FDT_ADDR_T_NONE) - return -EINVAL; + addr = NULL; priv->phy_addr = addr; - priv->portnr = devnump; addr = (void __iomem *)fdtdec_get_addr(blob, misc_off, "reg"); if ((fdt_addr_t)addr == FDT_ADDR_T_NONE) @@ -601,7 +594,13 @@ static int mx6_parse_dt_addrs(struct udevice *dev) priv->misc_addr = addr; #if defined(CONFIG_MX6) - int anatop_off; + int anatop_off, ret, devnump; + + ret = fdtdec_get_alias_seq(blob, dev->uclass->uc_drv->name, + phy_off, &devnump); + if (ret < 0) + return ret; + priv->portnr = devnump; /* Resolve ANATOP offset through USB PHY node */ anatop_off = fdtdec_lookup_phandle(blob, phy_off, "fsl,anatop"); |