diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2020-01-09 20:29:21 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-10 16:41:34 -0800 |
| commit | 8d46f6207a8948d179b107afb4dcd03c4b96c37f (patch) | |
| tree | 9cd85362db3e7c96e69ee521cf5b1c124beaa7eb /drivers | |
| parent | r8169: switch to phylib functions in rtl_writephy_batch (diff) | |
| download | linux-dev-8d46f6207a8948d179b107afb4dcd03c4b96c37f.tar.xz linux-dev-8d46f6207a8948d179b107afb4dcd03c4b96c37f.zip | |
r8169: move setting ERI register 0x1d0 for RTL8106
Writing this ERI register is a MAC setting, so move it to
rtl_hw_start_8106().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index dccc5a1d316f..d157c971c28e 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3425,8 +3425,6 @@ static void rtl8106e_hw_phy_config(struct rtl8169_private *tp, rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000); rtl_writephy_batch(phydev, phy_reg_init); - - rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000); } static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp, @@ -4999,6 +4997,8 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp) RTL_W8(tp, MCU, RTL_R8(tp, MCU) | EN_NDP | EN_OOB_RESET); RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~PFM_EN); + rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000); + rtl_pcie_state_l2l3_disable(tp); rtl_hw_aspm_clkreq_enable(tp, true); } |