mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
usb: ehci-mx6: Move fdtdec_get_alias_seq() inside the CONFIG_MX6
On a imx7s-warp board the fdtdec_get_alias_seq() function always fails. As priv->portnr is only used on i.MX6, move fdtdec_get_alias_seq() inside the CONFIG_MX6 block. Signed-off-by: Fabio Estevam <festevam@denx.de>
This commit is contained in:
parent
fcf3981161
commit
ec326b9325
1 changed files with 7 additions and 8 deletions
|
@ -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,11 +577,6 @@ 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;
|
||||
|
@ -592,7 +586,6 @@ static int mx6_parse_dt_addrs(struct udevice *dev)
|
|||
return -EINVAL;
|
||||
|
||||
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");
|
||||
|
|
Loading…
Add table
Reference in a new issue