Commit efa193ba authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 916d08f6 814c2bfd

drivers/net/ethernet/realtek/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
obj-$(CONFIG_8139CP) += 8139cp.o

obj-$(CONFIG_8139TOO) += 8139too.o

obj-$(CONFIG_ATP) += atp.o

r8169-objs += r8169_main.o r8169_firmware.o

r8169-objs += r8169_main.o r8169_firmware.o r8169_phy_config.o

obj-$(CONFIG_R8169) += r8169.o

drivers/net/ethernet/realtek/r8169.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* r8169.h: RealTek 8169/8168/8101 ethernet driver.

 *

 * Copyright (c) 2002 ShuChen <shuchen@realtek.com.tw>

 * Copyright (c) 2003 - 2007 Francois Romieu <romieu@fr.zoreil.com>

 * Copyright (c) a lot of people too. Please respect their work.

 *

 * See MAINTAINERS file for support contact information.

 */



#include <linux/types.h>

#include <linux/phy.h>



enum mac_version {

	/* support for ancient RTL_GIGA_MAC_VER_01 has been removed */

	RTL_GIGA_MAC_VER_02,

	RTL_GIGA_MAC_VER_03,

	RTL_GIGA_MAC_VER_04,

	RTL_GIGA_MAC_VER_05,

	RTL_GIGA_MAC_VER_06,

	RTL_GIGA_MAC_VER_07,

	RTL_GIGA_MAC_VER_08,

	RTL_GIGA_MAC_VER_09,

	RTL_GIGA_MAC_VER_10,

	RTL_GIGA_MAC_VER_11,

	RTL_GIGA_MAC_VER_12,

	RTL_GIGA_MAC_VER_13,

	RTL_GIGA_MAC_VER_14,

	RTL_GIGA_MAC_VER_15,

	RTL_GIGA_MAC_VER_16,

	RTL_GIGA_MAC_VER_17,

	RTL_GIGA_MAC_VER_18,

	RTL_GIGA_MAC_VER_19,

	RTL_GIGA_MAC_VER_20,

	RTL_GIGA_MAC_VER_21,

	RTL_GIGA_MAC_VER_22,

	RTL_GIGA_MAC_VER_23,

	RTL_GIGA_MAC_VER_24,

	RTL_GIGA_MAC_VER_25,

	RTL_GIGA_MAC_VER_26,

	RTL_GIGA_MAC_VER_27,

	RTL_GIGA_MAC_VER_28,

	RTL_GIGA_MAC_VER_29,

	RTL_GIGA_MAC_VER_30,

	RTL_GIGA_MAC_VER_31,

	RTL_GIGA_MAC_VER_32,

	RTL_GIGA_MAC_VER_33,

	RTL_GIGA_MAC_VER_34,

	RTL_GIGA_MAC_VER_35,

	RTL_GIGA_MAC_VER_36,

	RTL_GIGA_MAC_VER_37,

	RTL_GIGA_MAC_VER_38,

	RTL_GIGA_MAC_VER_39,

	RTL_GIGA_MAC_VER_40,

	RTL_GIGA_MAC_VER_41,

	RTL_GIGA_MAC_VER_42,

	RTL_GIGA_MAC_VER_43,

	RTL_GIGA_MAC_VER_44,

	RTL_GIGA_MAC_VER_45,

	RTL_GIGA_MAC_VER_46,

	RTL_GIGA_MAC_VER_47,

	RTL_GIGA_MAC_VER_48,

	RTL_GIGA_MAC_VER_49,

	RTL_GIGA_MAC_VER_50,

	RTL_GIGA_MAC_VER_51,

	RTL_GIGA_MAC_VER_52,

	RTL_GIGA_MAC_VER_60,

	RTL_GIGA_MAC_VER_61,

	RTL_GIGA_MAC_NONE

};



struct rtl8169_private;



void r8169_apply_firmware(struct rtl8169_private *tp);

u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp);

u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr);

void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,

			 enum mac_version ver);

drivers/net/ethernet/realtek/r8169_main.c

+24 −1386

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/realtek/r8169_phy_config.c

0 → 100644
+1307 −0

File added.

Preview size limit exceeded, changes collapsed.