Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / drivers / net / fm / b4860.c

diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c
index 8cde7afc1df0e2b5a9f1a112eb8d7f556f43e4af..3b5defefa62e1c9b7614d7c733f06325ba8920cc 100644 (file)
--- a/drivers/net/fm/b4860.c
+++ b/drivers/net/fm/b4860.c
@@ -55,8 +55,10 @@ 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)))
+       /*B4860 has two 10Gig Mac*/
+       if ((port == FM1_10GEC1 || port == FM1_10GEC2)  &&
+           ((is_serdes_configured(XAUI_FM1_MAC9))      ||
+           (is_serdes_configured(XAUI_FM1_MAC10))))
                return PHY_INTERFACE_MODE_XGMII;
 
        /* Fix me need to handle RGMII here first */