From: Ying Zhang Date: Mon, 18 Apr 2016 09:04:16 +0000 (+0800) Subject: powerpc:t4240: MAC9 and MAC10 should not be identified as 1G interface in some case X-Git-Tag: v2016.07-rc1~172^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ef548d5f13e68e1b3975d9b68920bfa8bf09891;p=u-boot powerpc:t4240: MAC9 and MAC10 should not be identified as 1G interface in some case 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 Reviewed-by: York Sun --- diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c index ae5aca4bb4..70887fa45f 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)) ||