r8169: move EEE LED config to rtl8168_config_eee_mac

Move adjusting the EEE LED frequency to rtl8168_config_eee_mac.
Exclude RTL8411 (version 38) like in the existing code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 656fcc6..f441ecb 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -2553,6 +2553,10 @@ static void rtl_apply_firmware_cond(struct rtl8169_private *tp, u8 reg, u16 val)
 
 static void rtl8168_config_eee_mac(struct rtl8169_private *tp)
 {
+       /* Adjust EEE LED frequency */
+       if (tp->mac_version != RTL_GIGA_MAC_VER_38)
+               RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) & ~0x07);
+
        rtl_eri_set_bits(tp, 0x1b0, ERIAR_MASK_1111, 0x0003);
 }
 
@@ -4991,9 +4995,6 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)
 
        RTL_W8(tp, MCU, RTL_R8(tp, MCU) & ~NOW_IS_OOB);
 
-       /* Adjust EEE LED frequency */
-       RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) & ~0x07);
-
        rtl8168_config_eee_mac(tp);
 
        RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) | PFM_EN);
@@ -5045,9 +5046,6 @@ static void rtl_hw_start_8168f_1(struct rtl8169_private *tp)
        rtl_ephy_init(tp, e_info_8168f_1);
 
        rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00);
-
-       /* Adjust EEE LED frequency */
-       RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) & ~0x07);
 }
 
 static void rtl_hw_start_8411(struct rtl8169_private *tp)
@@ -5087,9 +5085,6 @@ static void rtl_hw_start_8168g(struct rtl8169_private *tp)
        rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
        rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
 
-       /* Adjust EEE LED frequency */
-       RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) & ~0x07);
-
        rtl8168_config_eee_mac(tp);
 
        rtl_w0w1_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06);
@@ -5190,9 +5185,6 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
        rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
        rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
 
-       /* Adjust EEE LED frequency */
-       RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) & ~0x07);
-
        rtl8168_config_eee_mac(tp);
 
        RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~PFM_EN);
@@ -5271,9 +5263,6 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)
        rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
        rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
 
-       /* Adjust EEE LED frequency */
-       RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) & ~0x07);
-
        rtl8168_config_eee_mac(tp);
 
        rtl_w0w1_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06);