Skip to content

Commit efa193b

Browse files
committed
Merge branch 'r8169-factor-out-chip-specific-PHY-configuration-to-a-separate-source-file'
Heiner Kallweit says: ==================== r8169: factor out chip-specific PHY configuration to a separate source file Basically every chip version needs its own PHY configuration. To improve maintainability of the driver move all these PHY configurations to a separate source file. To allow this we first have to change all PHY configurations to use phylib functions wherever possible. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 916d08f + 814c2bf commit efa193b

File tree

4 files changed

+1410
-1387
lines changed

4 files changed

+1410
-1387
lines changed

drivers/net/ethernet/realtek/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
obj-$(CONFIG_8139CP) += 8139cp.o
77
obj-$(CONFIG_8139TOO) += 8139too.o
88
obj-$(CONFIG_ATP) += atp.o
9-
r8169-objs += r8169_main.o r8169_firmware.o
9+
r8169-objs += r8169_main.o r8169_firmware.o r8169_phy_config.o
1010
obj-$(CONFIG_R8169) += r8169.o

drivers/net/ethernet/realtek/r8169.h

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
2+
/* r8169.h: RealTek 8169/8168/8101 ethernet driver.
3+
*
4+
* Copyright (c) 2002 ShuChen <[email protected]>
5+
* Copyright (c) 2003 - 2007 Francois Romieu <[email protected]>
6+
* Copyright (c) a lot of people too. Please respect their work.
7+
*
8+
* See MAINTAINERS file for support contact information.
9+
*/
10+
11+
#include <linux/types.h>
12+
#include <linux/phy.h>
13+
14+
enum mac_version {
15+
/* support for ancient RTL_GIGA_MAC_VER_01 has been removed */
16+
RTL_GIGA_MAC_VER_02,
17+
RTL_GIGA_MAC_VER_03,
18+
RTL_GIGA_MAC_VER_04,
19+
RTL_GIGA_MAC_VER_05,
20+
RTL_GIGA_MAC_VER_06,
21+
RTL_GIGA_MAC_VER_07,
22+
RTL_GIGA_MAC_VER_08,
23+
RTL_GIGA_MAC_VER_09,
24+
RTL_GIGA_MAC_VER_10,
25+
RTL_GIGA_MAC_VER_11,
26+
RTL_GIGA_MAC_VER_12,
27+
RTL_GIGA_MAC_VER_13,
28+
RTL_GIGA_MAC_VER_14,
29+
RTL_GIGA_MAC_VER_15,
30+
RTL_GIGA_MAC_VER_16,
31+
RTL_GIGA_MAC_VER_17,
32+
RTL_GIGA_MAC_VER_18,
33+
RTL_GIGA_MAC_VER_19,
34+
RTL_GIGA_MAC_VER_20,
35+
RTL_GIGA_MAC_VER_21,
36+
RTL_GIGA_MAC_VER_22,
37+
RTL_GIGA_MAC_VER_23,
38+
RTL_GIGA_MAC_VER_24,
39+
RTL_GIGA_MAC_VER_25,
40+
RTL_GIGA_MAC_VER_26,
41+
RTL_GIGA_MAC_VER_27,
42+
RTL_GIGA_MAC_VER_28,
43+
RTL_GIGA_MAC_VER_29,
44+
RTL_GIGA_MAC_VER_30,
45+
RTL_GIGA_MAC_VER_31,
46+
RTL_GIGA_MAC_VER_32,
47+
RTL_GIGA_MAC_VER_33,
48+
RTL_GIGA_MAC_VER_34,
49+
RTL_GIGA_MAC_VER_35,
50+
RTL_GIGA_MAC_VER_36,
51+
RTL_GIGA_MAC_VER_37,
52+
RTL_GIGA_MAC_VER_38,
53+
RTL_GIGA_MAC_VER_39,
54+
RTL_GIGA_MAC_VER_40,
55+
RTL_GIGA_MAC_VER_41,
56+
RTL_GIGA_MAC_VER_42,
57+
RTL_GIGA_MAC_VER_43,
58+
RTL_GIGA_MAC_VER_44,
59+
RTL_GIGA_MAC_VER_45,
60+
RTL_GIGA_MAC_VER_46,
61+
RTL_GIGA_MAC_VER_47,
62+
RTL_GIGA_MAC_VER_48,
63+
RTL_GIGA_MAC_VER_49,
64+
RTL_GIGA_MAC_VER_50,
65+
RTL_GIGA_MAC_VER_51,
66+
RTL_GIGA_MAC_VER_52,
67+
RTL_GIGA_MAC_VER_60,
68+
RTL_GIGA_MAC_VER_61,
69+
RTL_GIGA_MAC_NONE
70+
};
71+
72+
struct rtl8169_private;
73+
74+
void r8169_apply_firmware(struct rtl8169_private *tp);
75+
u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp);
76+
u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr);
77+
void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
78+
enum mac_version ver);

0 commit comments

Comments
 (0)