diff mbox

[U-Boot,2/2,v2] powerpc:t4240: MAC9 and MAC10 should not be identified as 1G interface in some case

Message ID 1460970256-38904-2-git-send-email-ying.zhang@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

ying.zhang@freescale.com April 18, 2016, 9:04 a.m. UTC 
From: Ying Zhang <b40530@freescale.com>

When using rcw protocols to support 10G on MAC9 and MAC10, these MACs
should not be identified as 1G interface, otherwise, one MAC will be
listed as two Ethernet ports. For example, MAC9 will be listed as
FM1@TGEC1 and FM1@DTSEC9.

Signed-off-by: Ying Zhang <b40530@freescale.com>
---
[changed from v1]:
--- update the commit message.

 drivers/net/fm/t4240.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

York Sun May 25, 2016, 3:34 a.m. UTC | #1 
On 04/18/2016 02:13 AM, ying.zhang@freescale.com wrote:
> From: Ying Zhang <b40530@freescale.com>
> 
> When using rcw protocols to support 10G on MAC9 and MAC10, these MACs
> should not be identified as 1G interface, otherwise, one MAC will be
> listed as two Ethernet ports. For example, MAC9 will be listed as
> FM1@TGEC1 and FM1@DTSEC9.
> 
> Signed-off-by: Ying Zhang <b40530@freescale.com>
> ---
> [changed from v1]:
> --- update the commit message.
> 
>  drivers/net/fm/t4240.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)


Applied to u-boot-mpc85xx master branch, awaiting upstream.

Thanks.

York
diff mbox

Patch

diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c
index ae5aca4..70887fa 100644
--- a/drivers/net/fm/t4240.c
+++ b/drivers/net/fm/t4240.c
@@ -74,7 +74,7 @@  phy_interface_t fman_port_enet_if(enum fm_port port)
 	if ((port == FM1_DTSEC9 || port == FM1_DTSEC10) &&
 	    ((is_serdes_configured(XFI_FM1_MAC9)) ||
 	     (is_serdes_configured(XFI_FM1_MAC10))))
-		return PHY_INTERFACE_MODE_XGMII;
+		return PHY_INTERFACE_MODE_NONE;
 
 	if ((port == FM2_10GEC1 || port == FM2_10GEC2) &&
 	    ((is_serdes_configured(XAUI_FM2_MAC9))	||