diff options
| author | Tom Rini <[email protected]> | 2021-04-26 07:44:09 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-04-26 07:44:09 -0400 |
| commit | d06b8a60d82595448441762ac4e81489b7f952fd (patch) | |
| tree | c87561ec83bc715825ec045d5aed96cddaeb91cb /drivers | |
| parent | 4dda435131251a94b29afd52f010cf1ec5a7ceb2 (diff) | |
| parent | 647b392bf20614006917d5fcd3390347a668eee5 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
This fixes the broken H5 Ethernet and updates the R40 and A64 DT files,
so nothing really critical.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sun8i_emac.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index a6cdda81a76..5a1b38bf80f 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -554,7 +554,7 @@ static int parse_phy_pins(struct udevice *dev) * The GPIO pinmux value is an integration choice, so depends on the * SoC, not the EMAC variant. */ - if (IS_ENABLED(CONFIG_MACH_SUN8I_H3)) + if (IS_ENABLED(CONFIG_MACH_SUNXI_H3_H5)) iomux = SUN8I_IOMUX_H3; else if (IS_ENABLED(CONFIG_MACH_SUN8I_R40)) iomux = SUN8I_IOMUX_R40; @@ -562,8 +562,12 @@ static int parse_phy_pins(struct udevice *dev) iomux = SUN8I_IOMUX_H6; else if (IS_ENABLED(CONFIG_MACH_SUN50I_H616)) iomux = SUN8I_IOMUX_H616; - else + else if (IS_ENABLED(CONFIG_MACH_SUN8I_A83T)) + iomux = SUN8I_IOMUX; + else if (IS_ENABLED(CONFIG_MACH_SUN50I)) iomux = SUN8I_IOMUX; + else + BUILD_BUG_ON_MSG(1, "missing pinmux value for Ethernet pins"); for (i = 0; ; i++) { int pin; |