projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
[oweals/u-boot.git]
/
drivers
/
net
/
mpc5xxx_fec.c
diff --git
a/drivers/net/mpc5xxx_fec.c
b/drivers/net/mpc5xxx_fec.c
index 3d180db7498b7d0f9bf186035c6f11d4ef6d0437..1093ba59dac1e4d4ffd7228573315e88814224a7 100644
(file)
--- a/
drivers/net/mpc5xxx_fec.c
+++ b/
drivers/net/mpc5xxx_fec.c
@@
-440,8
+440,9
@@
static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis)
/*
* Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
* and do not drop the Preamble.
/*
* Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
* and do not drop the Preamble.
+ * No MII for 7-wire mode
*/
*/
- fec->eth->mii_speed = (((gd->
ipb_clk >> 20) / 5) << 1); /* No MII for 7-wire mode */
+ fec->eth->mii_speed = (((gd->
arch.ipb_clk >> 20) / 5) << 1);
}
if (fec->xcv_type != SEVENWIRE) {
}
if (fec->xcv_type != SEVENWIRE) {
@@
-644,8
+645,9
@@
static void mpc5xxx_fec_halt(struct eth_device *dev)
/*
* Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
* and do not drop the Preamble.
/*
* Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
* and do not drop the Preamble.
+ * No MII for 7-wire mode
*/
*/
- fec->eth->mii_speed = (((gd->
ipb_clk >> 20) / 5) << 1); /* No MII for 7-wire mode */
+ fec->eth->mii_speed = (((gd->
arch.ipb_clk >> 20) / 5) << 1);
}
#if (DEBUG & 0x3)
}
#if (DEBUG & 0x3)
@@
-909,8
+911,9
@@
int mpc5xxx_fec_initialize(bd_t * bis)
/*
* Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
* and do not drop the Preamble.
/*
* Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
* and do not drop the Preamble.
+ * No MII for 7-wire mode
*/
*/
- fec->eth->mii_speed = (((gd->
ipb_clk >> 20) / 5) << 1); /* No MII for 7-wire mode */
+ fec->eth->mii_speed = (((gd->
arch.ipb_clk >> 20) / 5) << 1);
}
dev->priv = (void *)fec;
}
dev->priv = (void *)fec;