Commit cd296780 authored by Francois Romieu's avatar Francois Romieu
Browse files

sunbmac: use standard #defines from mii.h. 



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent 78f6a6bd

drivers/net/ethernet/sun/sunbmac.c

+16 −15
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/crc32.h>

#include <linux/errno.h>

#include <linux/ethtool.h>

#include <linux/mii.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/skbuff.h>
@@ -500,13 +501,13 @@ static int try_next_permutation(struct bigmac *bp, void __iomem *tregs) 


		/* Reset the PHY. */

		bp->sw_bmcr	= (BMCR_ISOLATE | BMCR_PDOWN | BMCR_LOOPBACK);

		bigmac_tcvr_write(bp, tregs, BIGMAC_BMCR, bp->sw_bmcr);

		bigmac_tcvr_write(bp, tregs, MII_BMCR, bp->sw_bmcr);

		bp->sw_bmcr	= (BMCR_RESET);

		bigmac_tcvr_write(bp, tregs, BIGMAC_BMCR, bp->sw_bmcr);

		bigmac_tcvr_write(bp, tregs, MII_BMCR, bp->sw_bmcr);



		timeout = 64;

		while (--timeout) {

			bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, BIGMAC_BMCR);

			bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, MII_BMCR);

			if ((bp->sw_bmcr & BMCR_RESET) == 0)

				break;

			udelay(20);
@@ -514,11 +515,11 @@ static int try_next_permutation(struct bigmac *bp, void __iomem *tregs) 
		if (timeout == 0)

			printk(KERN_ERR "%s: PHY reset failed.\n", bp->dev->name);



		bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, BIGMAC_BMCR);

		bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, MII_BMCR);



		/* Now we try 10baseT. */

		bp->sw_bmcr &= ~(BMCR_SPEED100);

		bigmac_tcvr_write(bp, tregs, BIGMAC_BMCR, bp->sw_bmcr);

		bigmac_tcvr_write(bp, tregs, MII_BMCR, bp->sw_bmcr);

		return 0;

	}
@@ -534,8 +535,8 @@ static void bigmac_timer(unsigned long data) 


	bp->timer_ticks++;

	if (bp->timer_state == ltrywait) {

		bp->sw_bmsr = bigmac_tcvr_read(bp, tregs, BIGMAC_BMSR);

		bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, BIGMAC_BMCR);

		bp->sw_bmsr = bigmac_tcvr_read(bp, tregs, MII_BMSR);

		bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, MII_BMCR);

		if (bp->sw_bmsr & BMSR_LSTATUS) {

			printk(KERN_INFO "%s: Link is now up at %s.\n",

			       bp->dev->name,
@@ -588,18 +589,18 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp) 
	int timeout;



	/* Grab new software copies of PHY registers. */

	bp->sw_bmsr	= bigmac_tcvr_read(bp, tregs, BIGMAC_BMSR);

	bp->sw_bmcr	= bigmac_tcvr_read(bp, tregs, BIGMAC_BMCR);

	bp->sw_bmsr	= bigmac_tcvr_read(bp, tregs, MII_BMSR);

	bp->sw_bmcr	= bigmac_tcvr_read(bp, tregs, MII_BMCR);



	/* Reset the PHY. */

	bp->sw_bmcr	= (BMCR_ISOLATE | BMCR_PDOWN | BMCR_LOOPBACK);

	bigmac_tcvr_write(bp, tregs, BIGMAC_BMCR, bp->sw_bmcr);

	bigmac_tcvr_write(bp, tregs, MII_BMCR, bp->sw_bmcr);

	bp->sw_bmcr	= (BMCR_RESET);

	bigmac_tcvr_write(bp, tregs, BIGMAC_BMCR, bp->sw_bmcr);

	bigmac_tcvr_write(bp, tregs, MII_BMCR, bp->sw_bmcr);



	timeout = 64;

	while (--timeout) {

		bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, BIGMAC_BMCR);

		bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, MII_BMCR);

		if ((bp->sw_bmcr & BMCR_RESET) == 0)

			break;

		udelay(20);
@@ -607,11 +608,11 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp) 
	if (timeout == 0)

		printk(KERN_ERR "%s: PHY reset failed.\n", bp->dev->name);



	bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, BIGMAC_BMCR);

	bp->sw_bmcr = bigmac_tcvr_read(bp, tregs, MII_BMCR);



	/* First we try 100baseT. */

	bp->sw_bmcr |= BMCR_SPEED100;

	bigmac_tcvr_write(bp, tregs, BIGMAC_BMCR, bp->sw_bmcr);

	bigmac_tcvr_write(bp, tregs, MII_BMCR, bp->sw_bmcr);



	bp->timer_state = ltrywait;

	bp->timer_ticks = 0;
@@ -1054,7 +1055,7 @@ static u32 bigmac_get_link(struct net_device *dev) 
	struct bigmac *bp = netdev_priv(dev);



	spin_lock_irq(&bp->lock);

	bp->sw_bmsr = bigmac_tcvr_read(bp, bp->tregs, BIGMAC_BMSR);

	bp->sw_bmsr = bigmac_tcvr_read(bp, bp->tregs, MII_BMSR);

	spin_unlock_irq(&bp->lock);



	return (bp->sw_bmsr & BMSR_LSTATUS);

drivers/net/ethernet/sun/sunbmac.h

+0 −17
Original line number Diff line number Diff line
@@ -223,23 +223,6 @@ 
#define BIGMAC_PHY_EXTERNAL   0 /* External transceiver */

#define BIGMAC_PHY_INTERNAL   1 /* Internal transceiver */



/* PHY registers */

#define BIGMAC_BMCR           0x00 /* Basic mode control register	*/

#define BIGMAC_BMSR           0x01 /* Basic mode status register	*/



/* BMCR bits */

#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */

#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */

#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */

#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */

#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */

#define BMCR_RESET              0x8000  /* Reset the DP83840           */



/* BMSR bits */

#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */

#define BMSR_JCD                0x0002  /* Jabber detected             */

#define BMSR_LSTATUS            0x0004  /* Link status                 */



/* Ring descriptors and such, same as Quad Ethernet. */

struct be_rxd {

	u32 rx_flags;