git.librecmc.org Git - librecmc/librecmc.git/blob

   1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   2 Subject: [PATCH] net: phy: cherry-pick Broadcom drivers updates from v4.15
   3 MIME-Version: 1.0
   4 Content-Type: text/plain; charset=UTF-8
   5 Content-Transfer-Encoding: 8bit
   6
   7 This includes following upstream commits:
   8 2355a6546a05 net: phy: broadcom: support new device flag for setting master mode
   9
  10 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  11 ---
  12
  13 --- a/drivers/net/phy/broadcom.c
  14 +++ b/drivers/net/phy/broadcom.c
  15 @@ -43,6 +43,12 @@ static int bcm54210e_config_init(struct
  16         val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
  17         bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
  18
  19 +       if (phydev->dev_flags & PHY_BRCM_EN_MASTER_MODE) {
  20 +               val = phy_read(phydev, MII_CTRL1000);
  21 +               val |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER;
  22 +               phy_write(phydev, MII_CTRL1000, val);
  23 +       }
  24 +
  25         return 0;
  26  }
  27
  28 --- a/include/linux/brcmphy.h
  29 +++ b/include/linux/brcmphy.h
  30 @@ -59,6 +59,7 @@
  31  #define PHY_BRCM_EXT_IBND_TX_ENABLE    0x00002000
  32  #define PHY_BRCM_CLEAR_RGMII_MODE      0x00004000
  33  #define PHY_BRCM_DIS_TXCRXC_NOENRGY    0x00008000
  34 +#define PHY_BRCM_EN_MASTER_MODE                0x00010000
  35
  36  /* Broadcom BCM7xxx specific workarounds */
  37  #define PHY_BRCM_7XXX_REV(x)           (((x) >> 8) & 0xff)