diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
| commit | 5a24e12f13e7af70fbb7687da09f377ecbe17b84 (patch) | |
| tree | 6aeb94ed47e252474b0917a13505e1c533434629 /drivers/net/mscc_eswitch/felix_switch.c | |
| parent | f9bab982ae9e459b4e64c8a4ca8569aac32bb3bf (diff) | |
| parent | f11513d9978719820998ac05ed5a5da32465f926 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net into next
- Various DSA additions
- bootp: fix for VCI string
- tsec: support for promiscuous mode
- add Aspeed MDIO driver
Diffstat (limited to 'drivers/net/mscc_eswitch/felix_switch.c')
| -rw-r--r-- | drivers/net/mscc_eswitch/felix_switch.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/mscc_eswitch/felix_switch.c b/drivers/net/mscc_eswitch/felix_switch.c index 551fc2c9f9..2df8dde55f 100644 --- a/drivers/net/mscc_eswitch/felix_switch.c +++ b/drivers/net/mscc_eswitch/felix_switch.c @@ -16,6 +16,7 @@ */ #include <dm/device_compat.h> +#include <dm/of_extra.h> #include <linux/delay.h> #include <net/dsa.h> #include <asm/io.h> @@ -210,17 +211,14 @@ static int felix_init_sxgmii(struct mii_dev *imdio, int pidx) static void felix_start_pcs(struct udevice *dev, int port, struct phy_device *phy, struct mii_dev *imdio) { - bool autoneg = true; - - if (phy->phy_id == PHY_FIXED_ID || - phy->interface == PHY_INTERFACE_MODE_2500BASEX) - autoneg = false; + ofnode node = dsa_port_get_ofnode(dev, port); + bool inband_an = ofnode_eth_uses_inband_aneg(node); switch (phy->interface) { case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_2500BASEX: case PHY_INTERFACE_MODE_QSGMII: - felix_init_sgmii(imdio, port, autoneg); + felix_init_sgmii(imdio, port, inband_an); break; case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_USXGMII: |