| 12345678910111213141516171819202122232425262728293031323334353637 |
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
- Subject: [PATCH] net: phy: cherry-pick Broadcom drivers updates from v4.15
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- This includes following upstream commits:
- 2355a6546a05 net: phy: broadcom: support new device flag for setting master mode
- Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
- ---
- --- a/drivers/net/phy/broadcom.c
- +++ b/drivers/net/phy/broadcom.c
- @@ -43,6 +43,12 @@ static int bcm54210e_config_init(struct
- val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
- bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
-
- + if (phydev->dev_flags & PHY_BRCM_EN_MASTER_MODE) {
- + val = phy_read(phydev, MII_CTRL1000);
- + val |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER;
- + phy_write(phydev, MII_CTRL1000, val);
- + }
- +
- return 0;
- }
-
- --- a/include/linux/brcmphy.h
- +++ b/include/linux/brcmphy.h
- @@ -55,6 +55,7 @@
- #define PHY_BRCM_EXT_IBND_TX_ENABLE 0x00002000
- #define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000
- #define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000
- +#define PHY_BRCM_EN_MASTER_MODE 0x00010000
-
- /* Broadcom BCM7xxx specific workarounds */
- #define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff)
|
