diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-29 10:57:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-29 12:50:34 -0500 |
| commit | 41a737bb858b0890083c68bfd3813e1dbc18ff55 (patch) | |
| tree | f97d9ae4d793c4615cf4df103bfe71cb41d3f755 /drivers/net | |
| parent | ce54325c42a97ac38cc60891be713e7000e32e04 (diff) | |
| parent | 539612e27690a8df7f197cd1e9f4c2cf6ee1ac64 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
- Some cleanups in header files: those do not affect the generated
binaries at all.
- The usual update of DT files from the kernel repo, mostly adding new
board files this time. On the wake of this there is one defconfig to
enable a new board, some H618 TV box branded as "Transpeed".
- Samuel's series to support SPL FIT image loading for 32-bit SoCs as
well, so far this was restricted to ARM64 boards. I refrained from
automatically enabling this everywhere, instead this requires user
intervention during board configuration. This allows to ship the
"crust" management processor firmware on H3 boards, which enables
better power saving.
- One defconfig for an older H3 board. There was a close-by defconfig
for a related board, but there are some differences which deserve a
separate file.
- Support for the EMAC driver to work with fixed-link PHYs, which allows
to directly wire the MAC to a switch IC.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sun8i_emac.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index a12f7e32e8f..8bff4fe9a9e 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -833,11 +833,8 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev) priv->use_internal_phy = false; offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy-handle"); - if (offset < 0) { - debug("%s: Cannot find PHY address\n", __func__); - return -EINVAL; - } - priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", -1); + if (offset >= 0) + priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", -1); pdata->phy_interface = dev_read_phy_mode(dev); debug("phy interface %d\n", pdata->phy_interface); |