summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-11-27 17:43:25 +0100
committerStefan Roese <sr@denx.de>2006-11-27 17:43:25 +0100
commitf6e495f54cdb8fe340b9c03deab40ad746d52fae (patch)
tree44d3fe7fdf652fc1ff70334add71f88b2fc053e5
parent3b58d9459081ae33885335c645fc0b865584ae4e (diff)
downloadu-boot-imx-f6e495f54cdb8fe340b9c03deab40ad746d52fae.zip
u-boot-imx-f6e495f54cdb8fe340b9c03deab40ad746d52fae.tar.gz
u-boot-imx-f6e495f54cdb8fe340b9c03deab40ad746d52fae.tar.bz2
[PATCH] 4xx_enet.c: Correct the setting of zmiifer register
Patch below corrects the setting of the zmiifer register, it was overwritting the register rather than ORing the settings. Signed-off-by: Neil Wilson <NWilson@airspan.com> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--cpu/ppc4xx/4xx_enet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/ppc4xx/4xx_enet.c b/cpu/ppc4xx/4xx_enet.c
index 81d49ff..aefe126 100644
--- a/cpu/ppc4xx/4xx_enet.c
+++ b/cpu/ppc4xx/4xx_enet.c
@@ -264,10 +264,10 @@ int ppc_4xx_eth_setup_bridge(int devnum, bd_t * bis)
bis->bi_phymode[3] = BI_PHYMODE_ZMII;
break;
case 2:
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(0);
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(1);
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(2);
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(3);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(0);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(1);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(2);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(3);
bis->bi_phymode[0] = BI_PHYMODE_ZMII;
bis->bi_phymode[1] = BI_PHYMODE_ZMII;
bis->bi_phymode[2] = BI_PHYMODE_ZMII;