commit 2f3d4484f9aaec3901687237451d226f03cf582d
author Liu Zhongjian <zhongjia@codeaurora.org> Mon Apr 23 11:30:44 2018 +0800
committer Liu Zhongjian <zhongjia@codeaurora.org> Mon Jul 02 11:46:50 2018 +0800
tree c3eb3a53d836820ef06a0af561ce1307d9ab7d0e
parent 58750be7d7c3e01a41e8fe30ed114ab5bfdebfec

[qca-ssdk]: remove phy_addr_from_dts from phy_info.

Change-Id: I0f639a9d2a74445e151537b0c0890f32d4e44e19
Signed-off-by: Liu Zhongjian <zhongjia@codeaurora.org>

include/hsl/phy/hsl_phy.h

diff --git a/include/hsl/phy/hsl_phy.h b/include/hsl/phy/hsl_phy.h
index 59761e0..91c302e 100755
--- a/include/hsl/phy/hsl_phy.h
+++ b/include/hsl/phy/hsl_phy.h
@@ -296,7 +296,6 @@
 
 typedef struct {
 	a_uint32_t phy_address[SW_MAX_NR_PORT];
-	a_uint32_t phy_address_from_dts[SW_MAX_NR_PORT];
 	a_uint32_t phy_type[SW_MAX_NR_PORT];
 	/* fake mdio address is used to register the phy device,
 	 * when the phy is not accessed by the MDIO bus.
@@ -414,9 +413,6 @@
 qca_ssdk_phy_address_set(a_uint32_t dev_id, a_uint32_t port_id,
 	a_uint32_t phy_addr);
 
-a_uint32_t
-qca_ssdk_phy_address_from_dts_get(a_uint32_t dev_id, a_uint32_t port_id);
-
 #ifdef __cplusplus
 }
 #endif				/* __cplusplus */

src/adpt/hppe/adpt_hppe_portctrl.c

diff --git a/src/adpt/hppe/adpt_hppe_portctrl.c b/src/adpt/hppe/adpt_hppe_portctrl.c
index ef84329..bc9b5a7 100755
--- a/src/adpt/hppe/adpt_hppe_portctrl.c
+++ b/src/adpt/hppe/adpt_hppe_portctrl.c
@@ -2521,6 +2521,7 @@
 {
 	sw_error_t rv = SW_OK;
 	a_uint32_t phy_addr = 0, mode0 = PORT_WRAPPER_MAX;
+	ssdk_port_phyinfo *port_phyinfo = NULL;
 
 	if(port_id != SSDK_PHYSICAL_PORT5)
 	{
@@ -2528,7 +2529,8 @@
 	}
 	if(mode == PORT_WRAPPER_10GBASE_R)
 	{
-		phy_addr = qca_ssdk_phy_address_from_dts_get(dev_id, port_id);
+		port_phyinfo = ssdk_port_phyinfo_get(dev_id, port_id);
+		phy_addr = port_phyinfo->phy_addr;
 		qca_ssdk_phy_address_set(dev_id, port_id, phy_addr);
 		SSDK_DEBUG("port %x phy_addr is %x\n", port_id, phy_addr);
 	}

src/hsl/phy/hsl_phy.c

diff --git a/src/hsl/phy/hsl_phy.c b/src/hsl/phy/hsl_phy.c
index 0caf7e2..f7e0a09 100755
--- a/src/hsl/phy/hsl_phy.c
+++ b/src/hsl/phy/hsl_phy.c
@@ -315,7 +315,6 @@
 			a_uint32_t value)
 {
 	phy_info[dev_id]->phy_address[i] = value;
-	phy_info[dev_id]->phy_address_from_dts[i] = value;
 
 	return;
 }
@@ -350,13 +349,6 @@
 }
 
 a_uint32_t
-qca_ssdk_phy_address_from_dts_get(a_uint32_t dev_id,
-	a_uint32_t port_id)
-{
-	 return phy_info[dev_id]->phy_address_from_dts[port_id];
-}
-
-a_uint32_t
 qca_ssdk_port_to_phy_mdio_fake_addr(a_uint32_t dev_id, a_uint32_t port_id)
 {
 	return phy_info[dev_id]->phy_mdio_fake_address[port_id];