diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-10-13 14:06:18 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2017-10-13 14:14:45 +0200 |
| commit | 8ad1b09c6dcff814eb04084ef349f975025b7dc1 (patch) | |
| tree | 24368f22198ecc488057f2a71ffca9c6913979f3 /target/linux/generic/patches-4.4/078-0006-net-phy-cherry-pick-Broadcom-drivers-updates-from-v4.patch | |
| parent | c1023c8075b0590390020d65fd077b908cefad63 (diff) | |
| download | upstream-8ad1b09c6dcff814eb04084ef349f975025b7dc1.tar.gz upstream-8ad1b09c6dcff814eb04084ef349f975025b7dc1.tar.bz2 upstream-8ad1b09c6dcff814eb04084ef349f975025b7dc1.zip | |
kernel: add fix for bgmac with B50212E B1 PHY
This PHY requires some extra programming to work reliably with all
devices. Backport upstream fix for it.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/078-0006-net-phy-cherry-pick-Broadcom-drivers-updates-from-v4.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/078-0006-net-phy-cherry-pick-Broadcom-drivers-updates-from-v4.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/078-0006-net-phy-cherry-pick-Broadcom-drivers-updates-from-v4.patch b/target/linux/generic/patches-4.4/078-0006-net-phy-cherry-pick-Broadcom-drivers-updates-from-v4.patch new file mode 100644 index 0000000000..0723a35701 --- /dev/null +++ b/target/linux/generic/patches-4.4/078-0006-net-phy-cherry-pick-Broadcom-drivers-updates-from-v4.patch @@ -0,0 +1,37 @@ +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) |