Commit 7da97ec9 authored by Francois Romieu's avatar Francois Romieu
Browse files

r8169: more phy init for the 8168 



Realtek's r8168 driver version 8.003.00 adds new init sequences
(they do not appear in version 8.002.00).

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent a3f80671

drivers/net/r8169.c

+34 −0
Original line number Diff line number Diff line
@@ -1243,6 +1243,16 @@ static void rtl8169sb_hw_phy_config(void __iomem *ioaddr) 


	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));

}

static void rtl8168b_hw_phy_config(void __iomem *ioaddr)

{

	struct phy_reg phy_reg_init[] = {

		{ 0x1f, 0x0000 },

		{ 0x10, 0xf41b },

		{ 0x1f, 0x0000 }

	};



	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));

}



static void rtl8168cp_hw_phy_config(void __iomem *ioaddr)

{
@@ -1279,6 +1289,22 @@ static void rtl8168c_hw_phy_config(void __iomem *ioaddr) 
	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));

}



static void rtl8168cx_hw_phy_config(void __iomem *ioaddr)

{

	struct phy_reg phy_reg_init[] = {

		{ 0x1f, 0x0000 },

		{ 0x12, 0x2300 },

		{ 0x1f, 0x0003 },

		{ 0x16, 0x0f0a },

		{ 0x1f, 0x0000 },

		{ 0x1f, 0x0002 },

		{ 0x0c, 0x7eb8 },

		{ 0x1f, 0x0000 }

	};



	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));

}



static void rtl_hw_phy_config(struct net_device *dev)

{

	struct rtl8169_private *tp = netdev_priv(dev);
@@ -1296,12 +1322,20 @@ static void rtl_hw_phy_config(struct net_device *dev) 
	case RTL_GIGA_MAC_VER_04:

		rtl8169sb_hw_phy_config(ioaddr);

		break;

	case RTL_GIGA_MAC_VER_11:

	case RTL_GIGA_MAC_VER_12:

	case RTL_GIGA_MAC_VER_17:

		rtl8168b_hw_phy_config(ioaddr);

		break;

	case RTL_GIGA_MAC_VER_18:

		rtl8168cp_hw_phy_config(ioaddr);

		break;

	case RTL_GIGA_MAC_VER_19:

		rtl8168c_hw_phy_config(ioaddr);

		break;

	case RTL_GIGA_MAC_VER_20:

		rtl8168cx_hw_phy_config(ioaddr);

		break;

	default:

		break;

	}