tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

r8169: add new helper rtl8168g_enable_gphy_10m

Factor out setting GPHY 10M to new helper rtl8168g_enable_gphy_10m.

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

authored by

Heiner Kallweit and committed by
David S. Miller aba53204 adbea1a5

+10 -8
+10 -8
drivers/net/ethernet/realtek/r8169_phy_config.c
··· 796 796 phy_modify_paged(phydev, 0x0a43, 0x10, BIT(2), 0); 797 797 } 798 798 799 + static void rtl8168g_enable_gphy_10m(struct phy_device *phydev) 800 + { 801 + phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11)); 802 + } 803 + 799 804 static void rtl8168g_phy_adjust_10m_aldps(struct phy_device *phydev) 800 805 { 801 806 phy_modify_paged(phydev, 0x0bcc, 0x14, BIT(8), 0); ··· 909 904 r8168g_phy_param(phydev, 0x0811, 0x0000, 0x0800); 910 905 phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002); 911 906 912 - /* enable GPHY 10M */ 913 - phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11)); 907 + rtl8168g_enable_gphy_10m(phydev); 914 908 915 909 /* SAR ADC performance */ 916 910 phy_modify_paged(phydev, 0x0bca, 0x17, BIT(12) | BIT(13), BIT(14)); ··· 944 940 r8168g_phy_param(phydev, 0x0811, 0x0000, 0x0800); 945 941 phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002); 946 942 947 - /* enable GPHY 10M */ 948 - phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11)); 943 + rtl8168g_enable_gphy_10m(phydev); 949 944 950 945 ioffset = rtl8168h_2_get_adc_bias_ioffset(tp); 951 946 if (ioffset != 0xffff) ··· 1066 1063 1067 1064 r8168g_phy_param(phydev, 0x8011, 0x0000, 0x0800); 1068 1065 1069 - /* enable GPHY 10M */ 1070 - phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11)); 1066 + rtl8168g_enable_gphy_10m(phydev); 1071 1067 1072 1068 r8168g_phy_param(phydev, 0x8016, 0x0000, 0x0400); 1073 1069 ··· 1173 1171 phy_write_paged(phydev, 0xbc3, 0x12, 0x5555); 1174 1172 phy_modify_paged(phydev, 0xbf0, 0x15, 0x0e00, 0x0a00); 1175 1173 phy_modify_paged(phydev, 0xa5c, 0x10, 0x0400, 0x0000); 1176 - phy_modify_paged(phydev, 0xa44, 0x11, 0x0000, 0x0800); 1174 + rtl8168g_enable_gphy_10m(phydev); 1177 1175 1178 1176 rtl8125_config_eee_phy(phydev); 1179 1177 } ··· 1238 1236 phy_modify_paged(phydev, 0xa5d, 0x12, 0x0000, 0x0020); 1239 1237 phy_modify_paged(phydev, 0xad4, 0x17, 0x0010, 0x0000); 1240 1238 phy_modify_paged(phydev, 0xa86, 0x15, 0x0001, 0x0000); 1241 - phy_modify_paged(phydev, 0xa44, 0x11, 0x0000, 0x0800); 1239 + rtl8168g_enable_gphy_10m(phydev); 1242 1240 1243 1241 rtl8125_config_eee_phy(phydev); 1244 1242 }