diff options
| author | Tom Rini <[email protected]> | 2022-02-21 08:32:02 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-02-21 08:32:02 -0500 |
| commit | 24b628a8f844868adca897aae40af6f98cdbc26d (patch) | |
| tree | 43572009123231107d618dce3a4f84d7e2c536d6 /drivers/net | |
| parent | 55e9cef1432ffd42559874b2a469729f20b627d9 (diff) | |
| parent | 9bd4232f958b94fdd700e44897fb61bdc898b787 (diff) | |
Merge tag 'xilinx-for-v2022.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2022.04-rc3
microblaze:
- Fix exception handler
zynqmp:
- Show information about secure images
- DT changes (som u-boot file removal)
- Fix zynqmp_pm_cfg_obj_convert.py
- Fix platform boot
xilinx:
- Fix bootm_size calculation
- Remove GPIO_EXTRA_HEADER selection
power:
- Add zynqmp power management driver
scsi:
- Add phy support to ceva driver
zynq qspi:
- Fix unaligned accesses and check baudrate setup
- Add support for spi memory operations
net:
- Fix 64bit calculation in axi_emac
video:
- Add missing gpio dependency for seps driver
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/xilinx_axi_emac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 2ec76d0f52d..f21addb4d08 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -832,8 +832,8 @@ static int axi_emac_of_to_plat(struct udevice *dev) printf("%s: axistream is not found\n", __func__); return -EINVAL; } - plat->dmatx = (struct axidma_reg *)fdtdec_get_addr(gd->fdt_blob, - offset, "reg"); + plat->dmatx = (struct axidma_reg *)fdtdec_get_addr_size_auto_parent + (gd->fdt_blob, 0, offset, "reg", 0, NULL, false); if (!plat->dmatx) { printf("%s: axi_dma register space not found\n", __func__); return -EINVAL; |
