projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: lpc32xx: add RMII phy mode support
[oweals/u-boot.git]
/
drivers
/
net
/
mpc5xxx_fec.c
diff --git
a/drivers/net/mpc5xxx_fec.c
b/drivers/net/mpc5xxx_fec.c
index bc8c9222dcf8f9ac9f9d41ba9d16b03279b19cda..2ebd1761c3e7315fc904b152c709cc7657959a96 100644
(file)
--- a/
drivers/net/mpc5xxx_fec.c
+++ b/
drivers/net/mpc5xxx_fec.c
@@
-407,13
+407,8
@@
static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis)
*/
if (fec->xcv_type == SEVENWIRE) {
/* 10MBit with 7-wire operation */
*/
if (fec->xcv_type == SEVENWIRE) {
/* 10MBit with 7-wire operation */
-#if defined(CONFIG_TOTAL5200)
- /* 7-wire and USB2 on Ethernet */
- *(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00030000;
-#else /* !CONFIG_TOTAL5200 */
/* 7-wire only */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00020000;
/* 7-wire only */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00020000;
-#endif /* CONFIG_TOTAL5200 */
} else {
/* 100MBit with MD operation */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00050000;
} else {
/* 100MBit with MD operation */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00050000;
@@
-440,8
+435,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) {
@@
-475,11
+471,6
@@
static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis)
miiphy_write(dev->name, phyAddr, 0x0, 0x8000);
udelay(1000);
miiphy_write(dev->name, phyAddr, 0x0, 0x8000);
udelay(1000);
-#if defined(CONFIG_UC101) || defined(CONFIG_MUCMC52)
- /* Set the LED configuration Register for the UC101
- and MUCMC52 Board */
- miiphy_write(dev->name, phyAddr, 0x14, 0x4122);
-#endif
if (fec->xcv_type == MII10) {
/*
* Force 10Base-T, FDX operation
if (fec->xcv_type == MII10) {
/*
* Force 10Base-T, FDX operation
@@
-644,8
+635,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)
@@
-707,7
+699,7
@@
static void rfifo_print(char *devname, mpc5xxx_fec_priv *fec)
/********************************************************************/
/********************************************************************/
-static int mpc5xxx_fec_send(struct eth_device *dev, vo
latile vo
id *eth_data,
+static int mpc5xxx_fec_send(struct eth_device *dev, void *eth_data,
int data_length)
{
/*
int data_length)
{
/*
@@
-867,7
+859,7
@@
static int mpc5xxx_fec_recv(struct eth_device *dev)
*/
memcpy(buff, frame->head, 14);
memcpy(buff + 14, frame->data, frame_length);
*/
memcpy(buff, frame->head, 14);
memcpy(buff + 14, frame->data, frame_length);
-
NetReceive
(buff, frame_length);
+
net_process_received_packet
(buff, frame_length);
len = frame_length;
}
/*
len = frame_length;
}
/*
@@
-909,8
+901,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;