aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 2b5782056dda..e0d875531e6e 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -751,13 +751,11 @@ mii_queue(struct net_device *dev, int regval, void (*func)(uint, struct net_devi
751 if (mii_head) { 751 if (mii_head) {
752 mii_tail->mii_next = mip; 752 mii_tail->mii_next = mip;
753 mii_tail = mip; 753 mii_tail = mip;
754 } 754 } else {
755 else {
756 mii_head = mii_tail = mip; 755 mii_head = mii_tail = mip;
757 fep->hwp->fec_mii_data = regval; 756 fep->hwp->fec_mii_data = regval;
758 } 757 }
759 } 758 } else {
760 else {
761 retval = 1; 759 retval = 1;
762 } 760 }
763 761
@@ -792,7 +790,6 @@ static void mii_parse_sr(uint mii_reg, struct net_device *dev)
792 status |= PHY_STAT_FAULT; 790 status |= PHY_STAT_FAULT;
793 if (mii_reg & 0x0020) 791 if (mii_reg & 0x0020)
794 status |= PHY_STAT_ANC; 792 status |= PHY_STAT_ANC;
795
796 *s = status; 793 *s = status;
797} 794}
798 795
@@ -1239,7 +1236,6 @@ mii_link_interrupt(int irq, void * dev_id);
1239#endif 1236#endif
1240 1237
1241#if defined(CONFIG_M5272) 1238#if defined(CONFIG_M5272)
1242
1243/* 1239/*
1244 * Code specific to Coldfire 5272 setup. 1240 * Code specific to Coldfire 5272 setup.
1245 */ 1241 */
@@ -2020,8 +2016,7 @@ static void mii_relink(struct work_struct *work)
2020 & (PHY_STAT_100FDX | PHY_STAT_10FDX)) 2016 & (PHY_STAT_100FDX | PHY_STAT_10FDX))
2021 duplex = 1; 2017 duplex = 1;
2022 fec_restart(dev, duplex); 2018 fec_restart(dev, duplex);
2023 } 2019 } else
2024 else
2025 fec_stop(dev); 2020 fec_stop(dev);
2026 2021
2027#if 0 2022#if 0
@@ -2119,8 +2114,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev)
2119 fep->phy_id = phytype << 16; 2114 fep->phy_id = phytype << 16;
2120 mii_queue(dev, mk_mii_read(MII_REG_PHYIR2), 2115 mii_queue(dev, mk_mii_read(MII_REG_PHYIR2),
2121 mii_discover_phy3); 2116 mii_discover_phy3);
2122 } 2117 } else {
2123 else {
2124 fep->phy_addr++; 2118 fep->phy_addr++;
2125 mii_queue(dev, mk_mii_read(MII_REG_PHYIR1), 2119 mii_queue(dev, mk_mii_read(MII_REG_PHYIR1),
2126 mii_discover_phy); 2120 mii_discover_phy);
@@ -2574,8 +2568,7 @@ fec_restart(struct net_device *dev, int duplex)
2574 if (duplex) { 2568 if (duplex) {
2575 fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;/* MII enable */ 2569 fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;/* MII enable */
2576 fecp->fec_x_cntrl = 0x04; /* FD enable */ 2570 fecp->fec_x_cntrl = 0x04; /* FD enable */
2577 } 2571 } else {
2578 else {
2579 /* MII enable|No Rcv on Xmit */ 2572 /* MII enable|No Rcv on Xmit */
2580 fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x06; 2573 fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x06;
2581 fecp->fec_x_cntrl = 0x00; 2574 fecp->fec_x_cntrl = 0x00;