From: Prabhakar Kushwaha <prabhakar@freescale.com>
Date: Wed, 24 Feb 2016 11:32:32 +0000 (+0530)
Subject: armv8: ls2085a: Remove phy configuration from QDS and RDB
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f4b82a555a3b4eab2febf06eedf51ad85ba8ddd;p=project%2Fbcm63xx%2Fu-boot.git

armv8: ls2085a: Remove phy configuration from QDS and RDB

As phy_connect and phy_config are being called from DPAA2 driver.
Remove calling of mentioned function from board file.

Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
---

diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 42ff74317e..33ad7dcf3e 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -548,12 +548,6 @@ void ls2080a_handle_phy_interface_sgmii(int dpmac_id)
 			dpmac_info[dpmac_id].board_mux = EMI1_SLOT1;
 			bus = mii_dev_for_muxval(EMI1_SLOT1);
 			wriop_set_mdio(dpmac_id, bus);
-			dpmac_info[dpmac_id].phydev = phy_connect(
-						dpmac_info[dpmac_id].bus,
-						dpmac_info[dpmac_id].phy_addr,
-						NULL,
-						dpmac_info[dpmac_id].enet_if);
-			phy_config(dpmac_info[dpmac_id].phydev);
 			break;
 		case 2:
 			/* Slot housing a SGMII riser card? */
@@ -562,12 +556,6 @@ void ls2080a_handle_phy_interface_sgmii(int dpmac_id)
 			dpmac_info[dpmac_id].board_mux = EMI1_SLOT2;
 			bus = mii_dev_for_muxval(EMI1_SLOT2);
 			wriop_set_mdio(dpmac_id, bus);
-			dpmac_info[dpmac_id].phydev = phy_connect(
-						dpmac_info[dpmac_id].bus,
-						dpmac_info[dpmac_id].phy_addr,
-						NULL,
-						dpmac_info[dpmac_id].enet_if);
-			phy_config(dpmac_info[dpmac_id].phydev);
 			break;
 		case 3:
 			break;
@@ -606,12 +594,6 @@ serdes2:
 			dpmac_info[dpmac_id].board_mux = EMI1_SLOT4;
 			bus = mii_dev_for_muxval(EMI1_SLOT4);
 			wriop_set_mdio(dpmac_id, bus);
-			dpmac_info[dpmac_id].phydev = phy_connect(
-						dpmac_info[dpmac_id].bus,
-						dpmac_info[dpmac_id].phy_addr,
-						NULL,
-						dpmac_info[dpmac_id].enet_if);
-			phy_config(dpmac_info[dpmac_id].phydev);
 		break;
 		case 5:
 		break;
@@ -679,13 +661,6 @@ void ls2080a_handle_phy_interface_qsgmii(int dpmac_id)
 			dpmac_info[dpmac_id].board_mux = EMI1_SLOT1;
 			bus = mii_dev_for_muxval(EMI1_SLOT1);
 			wriop_set_mdio(dpmac_id, bus);
-			dpmac_info[dpmac_id].phydev = phy_connect(
-						dpmac_info[dpmac_id].bus,
-						dpmac_info[dpmac_id].phy_addr,
-						NULL,
-						dpmac_info[dpmac_id].enet_if);
-
-			phy_config(dpmac_info[dpmac_id].phydev);
 			break;
 		case 3:
 			break;
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index db50e4efa9..58ea746547 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -20,42 +20,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int load_firmware_cortina(struct phy_device *phy_dev)
-{
-	if (phy_dev->drv->config)
-		return phy_dev->drv->config(phy_dev);
-
-	return 0;
-}
-
-void load_phy_firmware(void)
-{
-	int i;
-	u8 phy_addr;
-	struct phy_device *phy_dev;
-	struct mii_dev *dev;
-	phy_interface_t interface;
-
-	/*Initialize and upload firmware for all the PHYs*/
-	for (i = WRIOP1_DPMAC1; i <= WRIOP1_DPMAC8; i++) {
-		interface = wriop_get_enet_if(i);
-		if (interface == PHY_INTERFACE_MODE_XGMII) {
-			dev = wriop_get_mdio(i);
-			phy_addr = wriop_get_phy_address(i);
-			phy_dev = phy_find_by_mask(dev, 1 << phy_addr,
-						interface);
-			if (!phy_dev) {
-				printf("No phydev for phyaddr %d\n", phy_addr);
-				continue;
-			}
-
-			/*Flash firmware for All CS4340 PHYS */
-			if (phy_dev->phy_id == PHY_UID_CS4340)
-				load_firmware_cortina(phy_dev);
-		}
-	}
-}
-
 int board_eth_init(bd_t *bis)
 {
 #if defined(CONFIG_FSL_MC_ENET)
@@ -125,9 +89,6 @@ int board_eth_init(bd_t *bis)
 		}
 	}
 
-	/* Load CORTINA CS4340 PHY firmware */
-	load_phy_firmware();
-
 	cpu_eth_init(bis);
 #endif /* CONFIG_FMAN_ENET */