summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-08 14:35:10 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-08 14:35:10 +0200
commit10e167329b029890a4c704f094822da5f259b886 (patch)
treec0950b7cb928ee26b07c39348e4539602ce3aec9 /drivers/net
parentdbc000bfb51eb30d786521e6b8e29048c36cbefa (diff)
parent4a1c7b13ae104d4526d3176793b7f6b06694df15 (diff)
downloadu-boot-imx-10e167329b029890a4c704f094822da5f259b886.zip
u-boot-imx-10e167329b029890a4c704f094822da5f259b886.tar.gz
u-boot-imx-10e167329b029890a4c704f094822da5f259b886.tar.bz2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts: drivers/serial/Makefile
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec_mxc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 4dbcdca..da95e28 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -516,9 +516,7 @@ static int fec_open(struct eth_device *edev)
#ifdef FEC_QUIRK_ENET_MAC
{
u32 ecr = readl(&fec->eth->ecntrl) & ~FEC_ECNTRL_SPEED;
- u32 rcr = (readl(&fec->eth->r_cntrl) &
- ~(FEC_RCNTRL_RMII | FEC_RCNTRL_RMII_10T)) |
- FEC_RCNTRL_RGMII | FEC_RCNTRL_MII_MODE;
+ u32 rcr = readl(&fec->eth->r_cntrl) & ~FEC_RCNTRL_RMII_10T;
if (speed == _1000BASET)
ecr |= FEC_ECNTRL_SPEED;
else if (speed != _100BASET)