summaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch')
-rw-r--r--target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch b/target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch
index 6a636a3e9d..6bc23c5206 100644
--- a/target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch
+++ b/target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch
@@ -8,11 +8,9 @@ Date: Thu May 15 00:12:26 2014 -0700
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
-Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c
-===================================================================
---- linux-4.3.orig/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-11-01 16:05:25.000000000 -0800
-+++ linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-12-18 10:43:28.000000000 -0800
-@@ -129,7 +129,7 @@
+--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
++++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
+@@ -129,7 +129,7 @@ out:
s32 igb_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
{
struct e1000_phy_info *phy = &hw->phy;
@@ -21,7 +19,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c
s32 ret_val = 0;
if (offset > MAX_PHY_REG_ADDRESS) {
-@@ -142,11 +142,25 @@
+@@ -142,11 +142,25 @@ s32 igb_read_phy_reg_mdic(struct e1000_h
* Control register. The MAC will take care of interfacing with the
* PHY to retrieve the desired data.
*/
@@ -50,7 +48,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c
/* Poll the ready bit to see if the MDI read completed
* Increasing the time out as testing showed failures with
-@@ -171,6 +185,18 @@
+@@ -171,6 +185,18 @@ s32 igb_read_phy_reg_mdic(struct e1000_h
*data = (u16) mdic;
out:
@@ -69,7 +67,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c
return ret_val;
}
-@@ -185,7 +211,7 @@
+@@ -185,7 +211,7 @@ out:
s32 igb_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
{
struct e1000_phy_info *phy = &hw->phy;
@@ -78,7 +76,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c
s32 ret_val = 0;
if (offset > MAX_PHY_REG_ADDRESS) {
-@@ -198,12 +224,27 @@
+@@ -198,12 +224,27 @@ s32 igb_write_phy_reg_mdic(struct e1000_
* Control register. The MAC will take care of interfacing with the
* PHY to retrieve the desired data.
*/
@@ -110,7 +108,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c
/* Poll the ready bit to see if the MDI read completed
* Increasing the time out as testing showed failures with
-@@ -227,6 +268,18 @@
+@@ -227,6 +268,18 @@ s32 igb_write_phy_reg_mdic(struct e1000_
}
out: