diff options
Diffstat (limited to 'drivers/net/fm/t4240.c')
| -rw-r--r-- | drivers/net/fm/t4240.c | 14 | 
1 files changed, 10 insertions, 4 deletions
| diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c index 48c530c91..275395f18 100644 --- a/drivers/net/fm/t4240.c +++ b/drivers/net/fm/t4240.c @@ -70,12 +70,18 @@ phy_interface_t fman_port_enet_if(enum fm_port port)  	if (is_device_disabled(port))  		return PHY_INTERFACE_MODE_NONE; -	if ((port == FM1_10GEC1 || port == FM1_10GEC2) -			&& (is_serdes_configured(XAUI_FM1))) +	if ((port == FM1_10GEC1 || port == FM1_10GEC2) && +	    ((is_serdes_configured(XAUI_FM1_MAC9))	|| +	     (is_serdes_configured(XAUI_FM1_MAC10))	|| +	     (is_serdes_configured(XFI_FM1_MAC9))	|| +	     (is_serdes_configured(XFI_FM1_MAC10))))  		return PHY_INTERFACE_MODE_XGMII; -	if ((port == FM2_10GEC1 || port == FM2_10GEC2) -			&& (is_serdes_configured(XAUI_FM2))) +	if ((port == FM2_10GEC1 || port == FM2_10GEC2) && +	    ((is_serdes_configured(XAUI_FM2_MAC9))	|| +	     (is_serdes_configured(XAUI_FM2_MAC10))	|| +	     (is_serdes_configured(XFI_FM2_MAC9))	|| +	     (is_serdes_configured(XFI_FM2_MAC10))))  		return PHY_INTERFACE_MODE_XGMII;  #define FSL_CORENET_RCWSR13_EC1			0x60000000 /* bits 417..418 */ |