summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-25 07:19:31 -0400
committerTom Rini <trini@konsulko.com>2016-05-25 07:19:31 -0400
commit826d06dbdd0e29ab0d8bd76d1ca640e2dfdb076c (patch)
tree01a7f2b3f69119bb26e72040ae52f91e32d68adc /drivers/net
parentfc15b9beed05dec6cc092c265042381a0eadb0e9 (diff)
parent8ef548d5f13e68e1b3975d9b68920bfa8bf09891 (diff)
downloadblackbird-obmc-uboot-826d06dbdd0e29ab0d8bd76d1ca640e2dfdb076c.tar.gz
blackbird-obmc-uboot-826d06dbdd0e29ab0d8bd76d1ca640e2dfdb076c.zip
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fm/t4240.c2
1 files changed, 1 insertions, 1 deletions
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)) ||
OpenPOWER on IntegriCloud