diff options
| author | Tom Rini <[email protected]> | 2025-12-01 10:26:02 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-12-01 10:26:02 -0600 |
| commit | 532582d217f3a00bac68003574ec158314fc2823 (patch) | |
| tree | 85f05a27093692cecc0b4f77d6a0b03e6dfbe77b | |
| parent | 5e9f5ea30f6d371ddf93ea472c0885e48504c968 (diff) | |
| parent | 7c1b99bd60185c24d2c78862c3345895ffcd1d71 (diff) | |
Merge tag 'net-20251201' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-20251201
net:
- phy: broadcom: fix RGMII delays for BCM54210E
- phy: dp83869: fix STRAP_OPMODE bitmask
| -rw-r--r-- | drivers/net/phy/broadcom.c | 4 | ||||
| -rw-r--r-- | drivers/net/phy/dp83869.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 1c02e3efedc..2d93ce0c966 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -176,11 +176,11 @@ static int bcm54210e_config(struct phy_device *phydev) { int ret; - ret = bcm54xx_config_clock_delay(phydev); + ret = bcm5461_config(phydev); if (ret < 0) return ret; - ret = bcm5461_config(phydev); + ret = bcm54xx_config_clock_delay(phydev); if (ret < 0) return ret; diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c index b6fb5adae1f..c60fbf26a03 100644 --- a/drivers/net/phy/dp83869.c +++ b/drivers/net/phy/dp83869.c @@ -5,6 +5,7 @@ */ #include <phy.h> +#include <linux/bitfield.h> #include <linux/compat.h> #include <malloc.h> @@ -64,7 +65,7 @@ #define DP83869_RGMII_RX_CLK_DELAY_EN BIT(0) /* STRAP_STS1 bits */ -#define DP83869_STRAP_OP_MODE_MASK GENMASK(2, 0) +#define DP83869_STRAP_OP_MODE_MASK GENMASK(11, 9) #define DP83869_STRAP_STS1_RESERVED BIT(11) #define DP83869_STRAP_MIRROR_ENABLED BIT(12) @@ -168,7 +169,7 @@ static int dp83869_set_strapped_mode(struct phy_device *phydev) if (val < 0) return val; - dp83869->mode = val & DP83869_STRAP_OP_MODE_MASK; + dp83869->mode = FIELD_GET(DP83869_STRAP_OP_MODE_MASK, val); return 0; } |