Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
This commit is contained in:
@@ -99,6 +99,7 @@
|
||||
#define DP83867_PHYCR_TX_FIFO_DEPTH_MASK GENMASK(15, 14)
|
||||
#define DP83867_PHYCR_RX_FIFO_DEPTH_MASK GENMASK(13, 12)
|
||||
#define DP83867_PHYCR_RESERVED_MASK BIT(11)
|
||||
#define DP83867_PHYCR_FORCE_LINK_GOOD BIT(10)
|
||||
|
||||
/* RGMIIDCTL bits */
|
||||
#define DP83867_RGMII_TX_CLK_DELAY_MAX 0xf
|
||||
@@ -635,7 +636,12 @@ static int dp83867_phy_reset(struct phy_device *phydev)
|
||||
|
||||
usleep_range(10, 20);
|
||||
|
||||
return 0;
|
||||
/* After reset FORCE_LINK_GOOD bit is set. Although the
|
||||
* default value should be unset. Disable FORCE_LINK_GOOD
|
||||
* for the phy to work properly.
|
||||
*/
|
||||
return phy_modify(phydev, MII_DP83867_PHYCTRL,
|
||||
DP83867_PHYCR_FORCE_LINK_GOOD, 0);
|
||||
}
|
||||
|
||||
static struct phy_driver dp83867_driver[] = {
|
||||
|
Reference in New Issue
Block a user