From fca94334532b938f48cf5f4c33ddd7951916c6d9 Mon Sep 17 00:00:00 2001
From: vojo <joris.van.vossen@sintecs.nl>
Date: Fri, 9 Feb 2018 13:54:35 +0100
Subject: Patch revoked due to changed eth0 phy addr


diff --git a/arch/arm64/boot/dts/freescale/grapeboard.dts b/arch/arm64/boot/dts/freescale/grapeboard.dts
index 3feb268..c1d1242 100644
--- a/arch/arm64/boot/dts/freescale/grapeboard.dts
+++ b/arch/arm64/boot/dts/freescale/grapeboard.dts
@@ -76,7 +76,7 @@
 		#size-cells = <0>;
 		reg = <0x0>;	/* GEM_ID */
 		fsl,gemac-bus-id = <0x0>;	/* BUS_ID */
-		fsl,gemac-phy-id = <0x0>;	/* PHY_ID */
+		fsl,gemac-phy-id = <0x1>;	/* PHY_ID */
 		fsl,mdio-mux-val = <0x0>;
 		phy-mode = "sgmii";
 		fsl,pfe-phy-if-flags = <0x0>;
diff --git a/drivers/staging/fsl_ppfe/pfe_eth.c b/drivers/staging/fsl_ppfe/pfe_eth.c
index 85acc10..b8d1cbc 100644
--- a/drivers/staging/fsl_ppfe/pfe_eth.c
+++ b/drivers/staging/fsl_ppfe/pfe_eth.c
@@ -1214,8 +1214,6 @@ static int pfe_phy_init(struct net_device *ndev)
 	char phy_id[MII_BUS_ID_SIZE + 3];
 	char bus_id[MII_BUS_ID_SIZE];
 	phy_interface_t interface;
-	
-	struct mii_bus *bus = pfe->eth.eth_priv[0]->mii_bus;
 
 	priv->oldlink = 0;
 	priv->oldspeed = 0;
@@ -1241,15 +1239,6 @@ static int pfe_phy_init(struct net_device *ndev)
 		/*Config MDIO from PAD */
 		regmap_write(pfe->scfg, 0x484, 0x80000000);
 	}
-	
-	/* 
-	 * Reset external PHY on MDIO bus with address 0 to undo
-	 * changes from the unintended external writes during the 
-	 * previous SERDES configuration. (Temporary fix)
-	 */
-	pfe_eth_mdio_write(bus, 0, 0x1F, 0x8000);
-	msleep(10);
- 	pfe_eth_mdio_write(bus, 0, 0x18, 0x61B6);
 
 	priv->oldlink = 0;
 	priv->oldspeed = 0;
-- 
cgit v0.10.2