leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r8169: move RTL8169scd Gigabyte PHY quirk

Browse Source 
In preparation of factoring out rtl8169scd_hw_phy_config() move this
quirk to rtl8169_init_phy().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2020-01-09 20:26:59 +01:00 committed by David S. Miller
parent b5aed0b3c2
commit fc712387b1
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/realtek/r8169_main.c
View File

@ -2425,17 +2425,6 @@ static void rtl8169sb_hw_phy_config(struct rtl8169_private *tp,
phy_write_paged(phydev, 0x0002, 0x01, 0x90d0); phy_write_paged(phydev, 0x0002, 0x01, 0x90d0);
} }
static void rtl8169scd_hw_phy_config_quirk(struct rtl8169_private *tp)
{
struct pci_dev *pdev = tp->pci_dev;
if ((pdev->subsystem_vendor != PCI_VENDOR_ID_GIGABYTE) ||
(pdev->subsystem_device != 0xe000))
return;
phy_write_paged(tp->phydev, 0x0001, 0x10, 0xf01b);
}
static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp, static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev) struct phy_device *phydev)
{ {
@ -2480,8 +2469,6 @@ static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp,
}; };
rtl_writephy_batch(tp, phy_reg_init); rtl_writephy_batch(tp, phy_reg_init);
rtl8169scd_hw_phy_config_quirk(tp);
} }
static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp, static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp,
@ -3633,6 +3620,11 @@ static void rtl8169_init_phy(struct rtl8169_private *tp)
RTL_W8(tp, 0x82, 0x01); RTL_W8(tp, 0x82, 0x01);
} }
if (tp->mac_version == RTL_GIGA_MAC_VER_05 &&
tp->pci_dev->subsystem_vendor == PCI_VENDOR_ID_GIGABYTE &&
tp->pci_dev->subsystem_device == 0xe000)
phy_write_paged(tp->phydev, 0x0001, 0x10, 0xf01b);
/* We may have called phy_speed_down before */ /* We may have called phy_speed_down before */
phy_speed_up(tp->phydev); phy_speed_up(tp->phydev);