Ran lindent and cleaned up whitespace issues.
authorJon Loeliger <jdl@freescale.com>
Tue, 10 Oct 2006 22:03:43 +0000 (17:03 -0500)
committerJon Loeliger <jdl@freescale.com>
Tue, 10 Oct 2006 22:03:43 +0000 (17:03 -0500)
Format for 80-columns too.

drivers/tsec.c

index 0fb3ca2..30dca11 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * tsec.c
  * Freescale Three Speed Ethernet Controller driver
  *
  * This software may be used and distributed according to the
@@ -28,13 +27,13 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define TX_BUF_CNT             2
 
-static uint rxIdx;     /* index of the current RX buffer */
-static uint txIdx;     /* index of the current TX buffer */
+static uint rxIdx;             /* index of the current RX buffer */
+static uint txIdx;             /* index of the current TX buffer */
 
 typedef volatile struct rtxbd {
        txbd8_t txbd[TX_BUF_CNT];
        rxbd8_t rxbd[PKTBUFSRX];
-}  RTXBD;
+} RTXBD;
 
 struct tsec_info_struct {
        unsigned int phyaddr;
@@ -42,7 +41,6 @@ struct tsec_info_struct {
        unsigned int phyregidx;
 };
 
-
 /* The tsec_info structure contains 3 values which the
  * driver uses to determine how to operate a given ethernet
  * device. The information needed is:
@@ -74,14 +72,14 @@ static struct tsec_info_struct tsec_info[] = {
 #elif defined(CONFIG_MPC86XX_TSEC1)
        {TSEC1_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC1_PHYIDX},
 #else
-       { 0, 0, 0},
+       {0, 0, 0},
 #endif
 #if defined(CONFIG_MPC85XX_TSEC2) || defined(CONFIG_MPC83XX_TSEC2)
        {TSEC2_PHY_ADDR, TSEC_GIGABIT, TSEC2_PHYIDX},
 #elif defined(CONFIG_MPC86XX_TSEC2)
-        {TSEC2_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC2_PHYIDX},
+       {TSEC2_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC2_PHYIDX},
 #else
-       { 0, 0, 0},
+       {0, 0, 0},
 #endif
 #ifdef CONFIG_MPC85XX_FEC
        {FEC_PHY_ADDR, 0, FEC_PHYIDX},
@@ -89,12 +87,12 @@ static struct tsec_info_struct tsec_info[] = {
 #if defined(CONFIG_MPC85XX_TSEC3) || defined(CONFIG_MPC83XX_TSEC3) || defined(CONFIG_MPC86XX_TSEC3)
        {TSEC3_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC3_PHYIDX},
 #else
-       { 0, 0, 0},
+       {0, 0, 0},
 #endif
 #if defined(CONFIG_MPC85XX_TSEC4) || defined(CONFIG_MPC83XX_TSEC4) || defined(CONFIG_MPC86XX_TSEC4)
        {TSEC4_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC4_PHYIDX},
 #else
-       { 0, 0, 0},
+       {0, 0, 0},
 #endif
 #endif
 };
@@ -111,68 +109,69 @@ static RTXBD rtx __attribute__ ((aligned(8)));
 #error "rtx must be 64-bit aligned"
 #endif
 
-static int tsec_send(struct eth_device* dev, volatile void *packet, int length);
-static int tsec_recv(struct eth_device* dev);
-static int tsec_init(struct eth_device* dev, bd_t * bd);
-static void tsec_halt(struct eth_device* dev);
-static void init_registers(volatile tsec_t *regs);
+static int tsec_send(struct eth_device *dev,
+                    volatile void *packet, int length);
+static int tsec_recv(struct eth_device *dev);
+static int tsec_init(struct eth_device *dev, bd_t * bd);
+static void tsec_halt(struct eth_device *dev);
+static void init_registers(volatile tsec_t * regs);
 static void startup_tsec(struct eth_device *dev);
 static int init_phy(struct eth_device *dev);
 void write_phy_reg(struct tsec_private *priv, uint regnum, uint value);
 uint read_phy_reg(struct tsec_private *priv, uint regnum);
-struct phy_info * get_phy_info(struct eth_device *dev);
+struct phy_info *get_phy_info(struct eth_device *dev);
 void phy_run_commands(struct tsec_private *priv, struct phy_cmd *cmd);
 static void adjust_link(struct eth_device *dev);
 static void relocate_cmds(void);
 static int tsec_miiphy_write(char *devname, unsigned char addr,
-               unsigned char reg, unsigned short value);
+                            unsigned char reg, unsigned short value);
 static int tsec_miiphy_read(char *devname, unsigned char addr,
-               unsigned char reg, unsigned short *value);
+                           unsigned char reg, unsigned short *value);
 
 /* Initialize device structure. Returns success if PHY
  * initialization succeeded (i.e. if it recognizes the PHY)
  */
-int tsec_initialize(bd_t *bis, int index, char *devname)
+int tsec_initialize(bd_t * bis, int index, char *devname)
 {
-       struct eth_devicedev;
+       struct eth_device *dev;
        int i;
        struct tsec_private *priv;
 
-       dev = (struct eth_device*) malloc(sizeof *dev);
+       dev = (struct eth_device *)malloc(sizeof *dev);
 
-       if(NULL == dev)
+       if (NULL == dev)
                return 0;
 
        memset(dev, 0, sizeof *dev);
 
-       priv = (struct tsec_private *) malloc(sizeof(*priv));
+       priv = (struct tsec_private *)malloc(sizeof(*priv));
 
-       if(NULL == priv)
+       if (NULL == priv)
                return 0;
 
        privlist[index] = priv;
-       priv->regs = (volatile tsec_t *)(TSEC_BASE_ADDR + index*TSEC_SIZE);
+       priv->regs = (volatile tsec_t *)(TSEC_BASE_ADDR + index * TSEC_SIZE);
        priv->phyregs = (volatile tsec_t *)(TSEC_BASE_ADDR +
-                       tsec_info[index].phyregidx*TSEC_SIZE);
+                                           tsec_info[index].phyregidx *
+                                           TSEC_SIZE);
 
        priv->phyaddr = tsec_info[index].phyaddr;
        priv->flags = tsec_info[index].flags;
 
        sprintf(dev->name, devname);
        dev->iobase = 0;
-       dev->priv   = priv;
-       dev->init   = tsec_init;
-       dev->halt   = tsec_halt;
-       dev->send   = tsec_send;
-       dev->recv   = tsec_recv;
+       dev->priv = priv;
+       dev->init = tsec_init;
+       dev->halt = tsec_halt;
+       dev->send = tsec_send;
+       dev->recv = tsec_recv;
 
        /* Tell u-boot to get the addr from the env */
-       for(i=0;i<6;i++)
+       for (i = 0; i < 6; i++)
                dev->enetaddr[i] = 0;
 
        eth_register(dev);
 
-
        /* Reset the MAC */
        priv->regs->maccfg1 |= MACCFG1_SOFT_RESET;
        priv->regs->maccfg1 &= ~(MACCFG1_SOFT_RESET);
@@ -186,12 +185,12 @@ int tsec_initialize(bd_t *bis, int index, char *devname)
        return init_phy(dev);
 }
 
-
 /* Initializes data structures and registers for the controller,
  * and brings the interface up.         Returns the link status, meaning
  * that it returns success if the link is up, failure otherwise.
- * This allows u-boot to find the first active controller. */
-int tsec_init(struct eth_device* dev, bd_t * bd)
+ * This allows u-boot to find the first active controller.
+ */
+int tsec_init(struct eth_device *dev, bd_t * bd)
 {
        uint tempval;
        char tmpbuf[MAC_ADDR_LEN];
@@ -210,12 +209,12 @@ int tsec_init(struct eth_device* dev, bd_t * bd)
 
        /* Copy the station address into the address registers.
         * Backwards, because little endian MACS are dumb */
-       for(i=0;i<MAC_ADDR_LEN;i++) {
+       for (i = 0; i < MAC_ADDR_LEN; i++) {
                tmpbuf[MAC_ADDR_LEN - 1 - i] = dev->enetaddr[i];
        }
-       regs->macstnaddr1 = *((uint *)(tmpbuf));
+       regs->macstnaddr1 = *((uint *) (tmpbuf));
 
-       tempval = *((uint *)(tmpbuf +4));
+       tempval = *((uint *) (tmpbuf + 4));
 
        regs->macstnaddr2 = tempval;
 
@@ -234,7 +233,6 @@ int tsec_init(struct eth_device* dev, bd_t * bd)
 
 }
 
-
 /* Write value to the device's PHY through the registers
  * specified in priv, modifying the register specified in regnum.
  * It will wait for the write to be done (or for a timeout to
@@ -244,17 +242,16 @@ void write_phy_reg(struct tsec_private *priv, uint regnum, uint value)
 {
        volatile tsec_t *regbase = priv->phyregs;
        uint phyid = priv->phyaddr;
-       int timeout=1000000;
+       int timeout = 1000000;
 
        regbase->miimadd = (phyid << 8) | regnum;
        regbase->miimcon = value;
        asm("sync");
 
-       timeout=1000000;
-       while((regbase->miimind & MIIMIND_BUSY) && timeout--);
+       timeout = 1000000;
+       while ((regbase->miimind & MIIMIND_BUSY) && timeout--) ;
 }
 
-
 /* Reads register regnum on the device's PHY through the
  * registers specified in priv.         It lowers and raises the read
  * command, and waits for the data to become valid (miimind
@@ -280,7 +277,7 @@ uint read_phy_reg(struct tsec_private *priv, uint regnum)
        asm("sync");
 
        /* Wait for the the indication that the read is done */
-       while((regbase->miimind & (MIIMIND_NOTVALID | MIIMIND_BUSY)));
+       while ((regbase->miimind & (MIIMIND_NOTVALID | MIIMIND_BUSY))) ;
 
        /* Grab the value read from the PHY */
        value = regbase->miimstat;
@@ -288,7 +285,6 @@ uint read_phy_reg(struct tsec_private *priv, uint regnum)
        return value;
 }
 
-
 /* Discover which PHY is attached to the device, and configure it
  * properly.  If the PHY is not recognized, then return 0
  * (failure).  Otherwise, return 1
@@ -297,32 +293,29 @@ static int init_phy(struct eth_device *dev)
 {
        struct tsec_private *priv = (struct tsec_private *)dev->priv;
        struct phy_info *curphy;
+       volatile tsec_t *regs = (volatile tsec_t *)(TSEC_BASE_ADDR);
 
        /* Assign a Physical address to the TBI */
-
-       {
-               volatile tsec_t *regs = (volatile tsec_t *)(TSEC_BASE_ADDR);
-               regs->tbipa = TBIPA_VALUE;
-               regs = (volatile tsec_t *)(TSEC_BASE_ADDR + TSEC_SIZE);
-               regs->tbipa = TBIPA_VALUE;
-               asm("sync");
-       }
+       regs->tbipa = TBIPA_VALUE;
+       regs = (volatile tsec_t *)(TSEC_BASE_ADDR + TSEC_SIZE);
+       regs->tbipa = TBIPA_VALUE;
+       asm("sync");
 
        /* Reset MII (due to new addresses) */
        priv->phyregs->miimcfg = MIIMCFG_RESET;
        asm("sync");
        priv->phyregs->miimcfg = MIIMCFG_INIT_VALUE;
        asm("sync");
-       while(priv->phyregs->miimind & MIIMIND_BUSY);
+       while (priv->phyregs->miimind & MIIMIND_BUSY) ;
 
-       if(0 == relocated)
+       if (0 == relocated)
                relocate_cmds();
 
        /* Get the cmd structure corresponding to the attached
         * PHY */
        curphy = get_phy_info(dev);
 
-       if(NULL == curphy) {
+       if (NULL == curphy) {
                printf("%s: No PHY found\n", dev->name);
 
                return 0;
@@ -335,49 +328,53 @@ static int init_phy(struct eth_device *dev)
        return 1;
 }
 
-
-/* Returns which value to write to the control register. */
-/* For 10/100, the value is slightly different */
-uint mii_cr_init(uint mii_reg, struct tsec_private *priv)
+/*
+ * Returns which value to write to the control register.
+ * For 10/100, the value is slightly different
+ */
+uint mii_cr_init(uint mii_reg, struct tsec_private * priv)
 {
-       if(priv->flags & TSEC_GIGABIT)
+       if (priv->flags & TSEC_GIGABIT)
                return MIIM_CONTROL_INIT;
        else
                return MIIM_CR_INIT;
 }
 
-
 /* Parse the status register for link, and then do
- * auto-negotiation */
-uint mii_parse_sr(uint mii_reg, struct tsec_private *priv)
+ * auto-negotiation
+ */
+uint mii_parse_sr(uint mii_reg, struct tsec_private * priv)
 {
        /*
-        * Wait if PHY is capable of autonegotiation and autonegotiation is not complete
+        * Wait if PHY is capable of autonegotiation and autonegotiation
+        * is not complete.
         */
        mii_reg = read_phy_reg(priv, MIIM_STATUS);
-       if ((mii_reg & PHY_BMSR_AUTN_ABLE) && !(mii_reg & PHY_BMSR_AUTN_COMP)) {
+       if ((mii_reg & PHY_BMSR_AUTN_ABLE)
+           && !(mii_reg & PHY_BMSR_AUTN_COMP)) {
                int i = 0;
 
-               puts ("Waiting for PHY auto negotiation to complete");
-               while (!((mii_reg & PHY_BMSR_AUTN_COMP) && (mii_reg & MIIM_STATUS_LINK))) {
+               puts("Waiting for PHY auto negotiation to complete");
+               while (!((mii_reg & PHY_BMSR_AUTN_COMP)
+                        && (mii_reg & MIIM_STATUS_LINK))) {
                        /*
                         * Timeout reached ?
                         */
                        if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
-                               puts (" TIMEOUT !\n");
+                               puts(" TIMEOUT !\n");
                                priv->link = 0;
                                return 0;
                        }
 
                        if ((i++ % 1000) == 0) {
-                               putc ('.');
+                               putc('.');
                        }
-                       udelay (1000);  /* 1 ms */
+                       udelay(1000);   /* 1 ms */
                        mii_reg = read_phy_reg(priv, MIIM_STATUS);
                }
-               puts (" done\n");
+               puts(" done\n");
                priv->link = 1;
-               udelay (500000);        /* another 500 ms (results in faster booting) */
+               udelay(500000); /* another 500 ms (results in faster booting) */
        } else {
                priv->link = 1;
        }
@@ -385,10 +382,10 @@ uint mii_parse_sr(uint mii_reg, struct tsec_private *priv)
        return 0;
 }
 
-
 /* Parse the 88E1011's status register for speed and duplex
- * information */
-uint mii_parse_88E1011_psr(uint mii_reg, struct tsec_private *priv)
+ * information
+ */
+uint mii_parse_88E1011_psr(uint mii_reg, struct tsec_private * priv)
 {
        uint speed;
 
@@ -398,114 +395,116 @@ uint mii_parse_88E1011_psr(uint mii_reg, struct tsec_private *priv)
              (mii_reg & MIIM_88E1011_PHYSTAT_LINK))) {
                int i = 0;
 
-               puts ("Waiting for PHY realtime link");
+               puts("Waiting for PHY realtime link");
                while (!((mii_reg & MIIM_88E1011_PHYSTAT_SPDDONE) &&
                         (mii_reg & MIIM_88E1011_PHYSTAT_LINK))) {
                        /*
                         * Timeout reached ?
                         */
                        if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
-                               puts (" TIMEOUT !\n");
+                               puts(" TIMEOUT !\n");
                                priv->link = 0;
                                break;
                        }
 
                        if ((i++ % 1000) == 0) {
-                               putc ('.');
+                               putc('.');
                        }
-                       udelay (1000);  /* 1 ms */
+                       udelay(1000);   /* 1 ms */
                        mii_reg = read_phy_reg(priv, MIIM_88E1011_PHY_STATUS);
                }
-               puts (" done\n");
-               udelay (500000);        /* another 500 ms (results in faster booting) */
+               puts(" done\n");
+               udelay(500000); /* another 500 ms (results in faster booting) */
        }
 
-       if(mii_reg & MIIM_88E1011_PHYSTAT_DUPLEX)
+       if (mii_reg & MIIM_88E1011_PHYSTAT_DUPLEX)
                priv->duplexity = 1;
        else
                priv->duplexity = 0;
 
-       speed = (mii_reg &MIIM_88E1011_PHYSTAT_SPEED);
+       speed = (mii_reg & MIIM_88E1011_PHYSTAT_SPEED);
 
-       switch(speed) {
-               case MIIM_88E1011_PHYSTAT_GBIT:
-                       priv->speed = 1000;
-                       break;
-               case MIIM_88E1011_PHYSTAT_100:
-                       priv->speed = 100;
-                       break;
-               default:
-                       priv->speed = 10;
+       switch (speed) {
+       case MIIM_88E1011_PHYSTAT_GBIT:
+               priv->speed = 1000;
+               break;
+       case MIIM_88E1011_PHYSTAT_100:
+               priv->speed = 100;
+               break;
+       default:
+               priv->speed = 10;
        }
 
        return 0;
 }
 
-
 /* Parse the cis8201's status register for speed and duplex
- * information */
-uint mii_parse_cis8201(uint mii_reg, struct tsec_private *priv)
+ * information
+ */
+uint mii_parse_cis8201(uint mii_reg, struct tsec_private * priv)
 {
        uint speed;
 
-       if(mii_reg & MIIM_CIS8201_AUXCONSTAT_DUPLEX)
+       if (mii_reg & MIIM_CIS8201_AUXCONSTAT_DUPLEX)
                priv->duplexity = 1;
        else
                priv->duplexity = 0;
 
        speed = mii_reg & MIIM_CIS8201_AUXCONSTAT_SPEED;
-       switch(speed) {
-               case MIIM_CIS8201_AUXCONSTAT_GBIT:
-                       priv->speed = 1000;
-                       break;
-               case MIIM_CIS8201_AUXCONSTAT_100:
-                       priv->speed = 100;
-                       break;
-               default:
-                       priv->speed = 10;
-                       break;
+       switch (speed) {
+       case MIIM_CIS8201_AUXCONSTAT_GBIT:
+               priv->speed = 1000;
+               break;
+       case MIIM_CIS8201_AUXCONSTAT_100:
+               priv->speed = 100;
+               break;
+       default:
+               priv->speed = 10;
+               break;
        }
 
        return 0;
 }
+
 /* Parse the vsc8244's status register for speed and duplex
- * information */
-uint mii_parse_vsc8244(uint mii_reg, struct tsec_private *priv)
+ * information
+ */
+uint mii_parse_vsc8244(uint mii_reg, struct tsec_private * priv)
 {
-        uint speed;
-                                                                                
-        if(mii_reg & MIIM_VSC8244_AUXCONSTAT_DUPLEX)
-                priv->duplexity = 1;
-        else
-                priv->duplexity = 0;
-                                                                                
-        speed = mii_reg & MIIM_VSC8244_AUXCONSTAT_SPEED;
-        switch(speed) {
-                case MIIM_VSC8244_AUXCONSTAT_GBIT:
-                        priv->speed = 1000;
-                        break;
-                case MIIM_VSC8244_AUXCONSTAT_100:
-                        priv->speed = 100;
-                        break;
-                default:
-                        priv->speed = 10;
-                        break;
-        }
-                                                                                
-        return 0;
-}
+       uint speed;
 
+       if (mii_reg & MIIM_VSC8244_AUXCONSTAT_DUPLEX)
+               priv->duplexity = 1;
+       else
+               priv->duplexity = 0;
+
+       speed = mii_reg & MIIM_VSC8244_AUXCONSTAT_SPEED;
+       switch (speed) {
+       case MIIM_VSC8244_AUXCONSTAT_GBIT:
+               priv->speed = 1000;
+               break;
+       case MIIM_VSC8244_AUXCONSTAT_100:
+               priv->speed = 100;
+               break;
+       default:
+               priv->speed = 10;
+               break;
+       }
+
+       return 0;
+}
 
 /* Parse the DM9161's status register for speed and duplex
- * information */
-uint mii_parse_dm9161_scsr(uint mii_reg, struct tsec_private *priv)
+ * information
+ */
+uint mii_parse_dm9161_scsr(uint mii_reg, struct tsec_private * priv)
 {
-       if(mii_reg & (MIIM_DM9161_SCSR_100F | MIIM_DM9161_SCSR_100H))
+       if (mii_reg & (MIIM_DM9161_SCSR_100F | MIIM_DM9161_SCSR_100H))
                priv->speed = 100;
        else
                priv->speed = 10;
 
-       if(mii_reg & (MIIM_DM9161_SCSR_100F | MIIM_DM9161_SCSR_10F))
+       if (mii_reg & (MIIM_DM9161_SCSR_100F | MIIM_DM9161_SCSR_10F))
                priv->duplexity = 1;
        else
                priv->duplexity = 0;
@@ -513,27 +512,28 @@ uint mii_parse_dm9161_scsr(uint mii_reg, struct tsec_private *priv)
        return 0;
 }
 
-
-/* Hack to write all 4 PHYs with the LED values */
-uint mii_cis8204_fixled(uint mii_reg, struct tsec_private *priv)
+/*
+ * Hack to write all 4 PHYs with the LED values
+ */
+uint mii_cis8204_fixled(uint mii_reg, struct tsec_private * priv)
 {
        uint phyid;
        volatile tsec_t *regbase = priv->phyregs;
-       int timeout=1000000;
+       int timeout = 1000000;
 
-       for(phyid=0;phyid<4;phyid++) {
+       for (phyid = 0; phyid < 4; phyid++) {
                regbase->miimadd = (phyid << 8) | mii_reg;
                regbase->miimcon = MIIM_CIS8204_SLEDCON_INIT;
                asm("sync");
 
-               timeout=1000000;
-               while((regbase->miimind & MIIMIND_BUSY) && timeout--);
+               timeout = 1000000;
+               while ((regbase->miimind & MIIMIND_BUSY) && timeout--) ;
        }
 
        return MIIM_CIS8204_SLEDCON_INIT;
 }
 
-uint mii_cis8204_setmode(uint mii_reg, struct tsec_private *priv)
+uint mii_cis8204_setmode(uint mii_reg, struct tsec_private * priv)
 {
        if (priv->flags & TSEC_REDUCED)
                return MIIM_CIS8204_EPHYCON_INIT | MIIM_CIS8204_EPHYCON_RGMII;
@@ -543,8 +543,9 @@ uint mii_cis8204_setmode(uint mii_reg, struct tsec_private *priv)
 
 /* Initialized required registers to appropriate values, zeroing
  * those we don't care about (unless zero is bad, in which case,
- * choose a more appropriate value) */
-static void init_registers(volatile tsec_t *regs)
+ * choose a more appropriate value)
+ */
+static void init_registers(volatile tsec_t * regs)
 {
        /* Clear IEVENT */
        regs->ievent = IEVENT_INIT_CLEAR;
@@ -586,55 +587,55 @@ static void init_registers(volatile tsec_t *regs)
 
 }
 
-
 /* Configure maccfg2 based on negotiated speed and duplex
- * reported by PHY handling code */
+ * reported by PHY handling code
+ */
 static void adjust_link(struct eth_device *dev)
 {
        struct tsec_private *priv = (struct tsec_private *)dev->priv;
        volatile tsec_t *regs = priv->regs;
 
-       if(priv->link) {
-               if(priv->duplexity != 0)
+       if (priv->link) {
+               if (priv->duplexity != 0)
                        regs->maccfg2 |= MACCFG2_FULL_DUPLEX;
                else
                        regs->maccfg2 &= ~(MACCFG2_FULL_DUPLEX);
 
-               switch(priv->speed) {
-                       case 1000:
-                               regs->maccfg2 = ((regs->maccfg2&~(MACCFG2_IF))
-                                       | MACCFG2_GMII);
-                               break;
-                       case 100:
-                       case 10:
-                               regs->maccfg2 = ((regs->maccfg2&~(MACCFG2_IF))
-                                       | MACCFG2_MII);
-
-                               /* If We're in reduced mode, we need
-                                * to say whether we're 10 or 100 MB.
-                                */
-                               if ((priv->speed == 100)
-                                   && (priv->flags & TSEC_REDUCED))
-                                       regs->ecntrl |= ECNTRL_R100;
-                               else
-                                       regs->ecntrl &= ~(ECNTRL_R100);
-                               break;
-                       default:
-                               printf("%s: Speed was bad\n", dev->name);
-                               break;
+               switch (priv->speed) {
+               case 1000:
+                       regs->maccfg2 = ((regs->maccfg2 & ~(MACCFG2_IF))
+                                        | MACCFG2_GMII);
+                       break;
+               case 100:
+               case 10:
+                       regs->maccfg2 = ((regs->maccfg2 & ~(MACCFG2_IF))
+                                        | MACCFG2_MII);
+
+                       /* If We're in reduced mode, we need
+                        * to say whether we're 10 or 100 MB.
+                        */
+                       if ((priv->speed == 100)
+                           && (priv->flags & TSEC_REDUCED))
+                               regs->ecntrl |= ECNTRL_R100;
+                       else
+                               regs->ecntrl &= ~(ECNTRL_R100);
+                       break;
+               default:
+                       printf("%s: Speed was bad\n", dev->name);
+                       break;
                }
 
                printf("Speed: %d, %s duplex\n", priv->speed,
-                               (priv->duplexity) ? "full" : "half");
+                      (priv->duplexity) ? "full" : "half");
 
        } else {
                printf("%s: No link.\n", dev->name);
        }
 }
 
-
 /* Set up the buffers and their descriptors, and bring up the
- * interface */
+ * interface
+ */
 static void startup_tsec(struct eth_device *dev)
 {
        int i;
@@ -649,17 +650,17 @@ static void startup_tsec(struct eth_device *dev)
        for (i = 0; i < PKTBUFSRX; i++) {
                rtx.rxbd[i].status = RXBD_EMPTY;
                rtx.rxbd[i].length = 0;
-               rtx.rxbd[i].bufPtr = (uint)NetRxPackets[i];
+               rtx.rxbd[i].bufPtr = (uint) NetRxPackets[i];
        }
-       rtx.rxbd[PKTBUFSRX -1].status |= RXBD_WRAP;
+       rtx.rxbd[PKTBUFSRX - 1].status |= RXBD_WRAP;
 
        /* Initialize the TX Buffer Descriptors */
-       for(i=0; i<TX_BUF_CNT; i++) {
+       for (i = 0; i < TX_BUF_CNT; i++) {
                rtx.txbd[i].status = 0;
                rtx.txbd[i].length = 0;
                rtx.txbd[i].bufPtr = 0;
        }
-       rtx.txbd[TX_BUF_CNT -1].status |= TXBD_WRAP;
+       rtx.txbd[TX_BUF_CNT - 1].status |= TXBD_WRAP;
 
        /* Start up the PHY */
        phy_run_commands(priv, priv->phyinfo->startup);
@@ -677,8 +678,9 @@ static void startup_tsec(struct eth_device *dev)
 /* This returns the status bits of the device. The return value
  * is never checked, and this is what the 8260 driver did, so we
  * do the same.         Presumably, this would be zero if there were no
- * errors */
-static int tsec_send(struct eth_device* dev, volatile void *packet, int length)
+ * errors
+ */
+static int tsec_send(struct eth_device *dev, volatile void *packet, int length)
 {
        int i;
        int result = 0;
@@ -686,24 +688,25 @@ static int tsec_send(struct eth_device* dev, volatile void *packet, int length)
        volatile tsec_t *regs = priv->regs;
 
        /* Find an empty buffer descriptor */
-       for(i=0; rtx.txbd[txIdx].status & TXBD_READY; i++) {
+       for (i = 0; rtx.txbd[txIdx].status & TXBD_READY; i++) {
                if (i >= TOUT_LOOP) {
-                       debug ("%s: tsec: tx buffers full\n", dev->name);
+                       debug("%s: tsec: tx buffers full\n", dev->name);
                        return result;
                }
        }
 
-       rtx.txbd[txIdx].bufPtr = (uint)packet;
+       rtx.txbd[txIdx].bufPtr = (uint) packet;
        rtx.txbd[txIdx].length = length;
-       rtx.txbd[txIdx].status |= (TXBD_READY | TXBD_LAST | TXBD_CRC | TXBD_INTERRUPT);
+       rtx.txbd[txIdx].status |=
+           (TXBD_READY | TXBD_LAST | TXBD_CRC | TXBD_INTERRUPT);
 
        /* Tell the DMA to go */
        regs->tstat = TSTAT_CLEAR_THALT;
 
        /* Wait for buffer to be transmitted */
-       for(i=0; rtx.txbd[txIdx].status & TXBD_READY; i++) {
+       for (i = 0; rtx.txbd[txIdx].status & TXBD_READY; i++) {
                if (i >= TOUT_LOOP) {
-                       debug ("%s: tsec: tx error\n", dev->name);
+                       debug("%s: tsec: tx error\n", dev->name);
                        return result;
                }
        }
@@ -714,13 +717,13 @@ static int tsec_send(struct eth_device* dev, volatile void *packet, int length)
        return result;
 }
 
-static int tsec_recv(struct eth_devicedev)
+static int tsec_recv(struct eth_device *dev)
 {
        int length;
        struct tsec_private *priv = (struct tsec_private *)dev->priv;
        volatile tsec_t *regs = priv->regs;
 
-       while(!(rtx.rxbd[rxIdx].status & RXBD_EMPTY)) {
+       while (!(rtx.rxbd[rxIdx].status & RXBD_EMPTY)) {
 
                length = rtx.rxbd[rxIdx].length;
 
@@ -729,18 +732,19 @@ static int tsec_recv(struct eth_device* dev)
                        NetReceive(NetRxPackets[rxIdx], length - 4);
                } else {
                        printf("Got error %x\n",
-                                       (rtx.rxbd[rxIdx].status & RXBD_STATS));
+                              (rtx.rxbd[rxIdx].status & RXBD_STATS));
                }
 
                rtx.rxbd[rxIdx].length = 0;
 
                /* Set the wrap bit if this is the last element in the list */
-               rtx.rxbd[rxIdx].status = RXBD_EMPTY | (((rxIdx + 1) == PKTBUFSRX) ? RXBD_WRAP : 0);
+               rtx.rxbd[rxIdx].status =
+                   RXBD_EMPTY | (((rxIdx + 1) == PKTBUFSRX) ? RXBD_WRAP : 0);
 
                rxIdx = (rxIdx + 1) % PKTBUFSRX;
        }
 
-       if(regs->ievent&IEVENT_BSY) {
+       if (regs->ievent & IEVENT_BSY) {
                regs->ievent = IEVENT_BSY;
                regs->rstat = RSTAT_CLEAR_RHALT;
        }
@@ -749,9 +753,8 @@ static int tsec_recv(struct eth_device* dev)
 
 }
 
-
 /* Stop the interface */
-static void tsec_halt(struct eth_devicedev)
+static void tsec_halt(struct eth_device *dev)
 {
        struct tsec_private *priv = (struct tsec_private *)dev->priv;
        volatile tsec_t *regs = priv->regs;
@@ -759,7 +762,7 @@ static void tsec_halt(struct eth_device* dev)
        regs->dmactrl &= ~(DMACTRL_GRS | DMACTRL_GTS);
        regs->dmactrl |= (DMACTRL_GRS | DMACTRL_GTS);
 
-       while(!(regs->ievent & (IEVENT_GRSC | IEVENT_GTSC)));
+       while (!(regs->ievent & (IEVENT_GRSC | IEVENT_GTSC))) ;
 
        regs->maccfg1 &= ~(MACCFG1_TX_EN | MACCFG1_RX_EN);
 
@@ -767,69 +770,70 @@ static void tsec_halt(struct eth_device* dev)
        phy_run_commands(priv, priv->phyinfo->shutdown);
 }
 
-
 struct phy_info phy_info_M88E1011S = {
        0x01410c6,
        "Marvell 88E1011S",
        4,
-       (struct phy_cmd[]) { /* config */
-               /* Reset and configure the PHY */
-               {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
-               {0x1d, 0x1f, NULL},
-               {0x1e, 0x200c, NULL},
-               {0x1d, 0x5, NULL},
-               {0x1e, 0x0, NULL},
-               {0x1e, 0x100, NULL},
-               {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
-               {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
-               {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* startup */
-               /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, &mii_parse_sr},
-               /* Read the status */
-               {MIIM_88E1011_PHY_STATUS, miim_read, &mii_parse_88E1011_psr},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* shutdown */
-               {miim_end,}
-       },
+       (struct phy_cmd[]){     /* config */
+                          /* Reset and configure the PHY */
+                          {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+                          {0x1d, 0x1f, NULL},
+                          {0x1e, 0x200c, NULL},
+                          {0x1d, 0x5, NULL},
+                          {0x1e, 0x0, NULL},
+                          {0x1e, 0x100, NULL},
+                          {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
+                          {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
+                          {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+                          {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Status is read once to clear old link state */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          /* Read the status */
+                          {MIIM_88E1011_PHY_STATUS, miim_read,
+                           &mii_parse_88E1011_psr},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 
 struct phy_info phy_info_M88E1111S = {
        0x01410cc,
        "Marvell 88E1111S",
        4,
-       (struct phy_cmd[]) { /* config */
-         /* Reset and configure the PHY */
-               {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
-               {0x1d, 0x1f, NULL},
-               {0x1e, 0x200c, NULL},
-               {0x1d, 0x5, NULL},
-               {0x1e, 0x0, NULL},
-               {0x1e, 0x100, NULL},
-               {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
-               {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
-               {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* startup */
-         /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, &mii_parse_sr},
-               /* Read the status */
-               {MIIM_88E1011_PHY_STATUS, miim_read, &mii_parse_88E1011_psr},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* shutdown */
-               {miim_end,}
-       },
+       (struct phy_cmd[]){     /* config */
+                          /* Reset and configure the PHY */
+                          {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+                          {0x1d, 0x1f, NULL},
+                          {0x1e, 0x200c, NULL},
+                          {0x1d, 0x5, NULL},
+                          {0x1e, 0x0, NULL},
+                          {0x1e, 0x100, NULL},
+                          {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
+                          {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
+                          {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+                          {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Status is read once to clear old link state */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          /* Read the status */
+                          {MIIM_88E1011_PHY_STATUS, miim_read,
+                           &mii_parse_88E1011_psr},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 
 static unsigned int m88e1145_setmode(uint mii_reg, struct tsec_private *priv)
@@ -837,12 +841,10 @@ static unsigned int m88e1145_setmode(uint mii_reg, struct tsec_private *priv)
        unsigned int temp;
        uint mii_data = read_phy_reg(priv, mii_reg);
 
-
        /* Setting MIIM_88E1145_PHY_EXT_CR */
        if (priv->flags & TSEC_REDUCED)
                return mii_data |
-                       MIIM_M88E1145_RGMII_RX_DELAY |
-                       MIIM_M88E1145_RGMII_TX_DELAY;
+                   MIIM_M88E1145_RGMII_RX_DELAY | MIIM_M88E1145_RGMII_TX_DELAY;
        else
                return mii_data;
 }
@@ -851,64 +853,70 @@ static struct phy_info phy_info_M88E1145 = {
        0x01410cd,
        "Marvell 88E1145",
        4,
-       (struct phy_cmd[]) { /* config */
-               /* Errata E0, E1 */
-               {29, 0x001b, NULL},
-               {30, 0x418f, NULL},
-               {29, 0x0016, NULL},
-               {30, 0xa2da, NULL},
-
-               /* Reset and configure the PHY */
-               {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
-               {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
-               {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
-               {MIIM_88E1011_PHY_SCR, MIIM_88E1011_PHY_MDI_X_AUTO, NULL},
-               {MIIM_88E1145_PHY_EXT_CR, 0, &m88e1145_setmode},
-               {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, NULL},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* startup */
-               /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, &mii_parse_sr},
-               {MIIM_88E1111_PHY_LED_CONTROL, MIIM_88E1111_PHY_LED_DIRECT, NULL},
-               /* Read the Status */
-               {MIIM_88E1011_PHY_STATUS, miim_read, &mii_parse_88E1011_psr},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* shutdown */
-               {miim_end,}
-       },
+       (struct phy_cmd[]){     /* config */
+                          /* Errata E0, E1 */
+                          {29, 0x001b, NULL},
+                          {30, 0x418f, NULL},
+                          {29, 0x0016, NULL},
+                          {30, 0xa2da, NULL},
+
+                          /* Reset and configure the PHY */
+                          {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+                          {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
+                          {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
+                          {MIIM_88E1011_PHY_SCR, MIIM_88E1011_PHY_MDI_X_AUTO,
+                           NULL},
+                          {MIIM_88E1145_PHY_EXT_CR, 0, &m88e1145_setmode},
+                          {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
+                          {MIIM_CONTROL, MIIM_CONTROL_INIT, NULL},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Status is read once to clear old link state */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          {MIIM_88E1111_PHY_LED_CONTROL,
+                           MIIM_88E1111_PHY_LED_DIRECT, NULL},
+                          /* Read the Status */
+                          {MIIM_88E1011_PHY_STATUS, miim_read,
+                           &mii_parse_88E1011_psr},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 
-
 struct phy_info phy_info_cis8204 = {
        0x3f11,
        "Cicada Cis8204",
        6,
-       (struct phy_cmd[]) { /* config */
-               /* Override PHY config settings */
-               {MIIM_CIS8201_AUX_CONSTAT, MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
-               /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
-               {MIIM_CIS8204_SLED_CON, MIIM_CIS8204_SLEDCON_INIT, &mii_cis8204_fixled},
-               {MIIM_CIS8204_EPHY_CON, MIIM_CIS8204_EPHYCON_INIT, &mii_cis8204_setmode},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* startup */
-               /* Read the Status (2x to make sure link is right) */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, &mii_parse_sr},
-               /* Read the status */
-               {MIIM_CIS8201_AUX_CONSTAT, miim_read, &mii_parse_cis8201},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* shutdown */
-               {miim_end,}
-       },
+       (struct phy_cmd[]){     /* config */
+                          /* Override PHY config settings */
+                          {MIIM_CIS8201_AUX_CONSTAT,
+                           MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
+                          /* Configure some basic stuff */
+                          {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+                          {MIIM_CIS8204_SLED_CON, MIIM_CIS8204_SLEDCON_INIT,
+                           &mii_cis8204_fixled},
+                          {MIIM_CIS8204_EPHY_CON, MIIM_CIS8204_EPHYCON_INIT,
+                           &mii_cis8204_setmode},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Read the Status (2x to make sure link is right) */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          /* Read the status */
+                          {MIIM_CIS8201_AUX_CONSTAT, miim_read,
+                           &mii_parse_cis8201},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 
 /* Cicada 8201 */
@@ -916,81 +924,86 @@ struct phy_info phy_info_cis8201 = {
        0xfc41,
        "CIS8201",
        4,
-       (struct phy_cmd[]) { /* config */
-               /* Override PHY config settings */
-               {MIIM_CIS8201_AUX_CONSTAT, MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
-               /* Set up the interface mode */
-               {MIIM_CIS8201_EXT_CON1, MIIM_CIS8201_EXTCON1_INIT, NULL},
-               /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* startup */
-               /* Read the Status (2x to make sure link is right) */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, &mii_parse_sr},
-               /* Read the status */
-               {MIIM_CIS8201_AUX_CONSTAT, miim_read, &mii_parse_cis8201},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* shutdown */
-               {miim_end,}
-       },
+       (struct phy_cmd[]){     /* config */
+                          /* Override PHY config settings */
+                          {MIIM_CIS8201_AUX_CONSTAT,
+                           MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
+                          /* Set up the interface mode */
+                          {MIIM_CIS8201_EXT_CON1, MIIM_CIS8201_EXTCON1_INIT,
+                           NULL},
+                          /* Configure some basic stuff */
+                          {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Read the Status (2x to make sure link is right) */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          /* Read the status */
+                          {MIIM_CIS8201_AUX_CONSTAT, miim_read,
+                           &mii_parse_cis8201},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 struct phy_info phy_info_VSC8244 = {
-        0x3f1b,
-        "Vitesse VSC8244",
-        6,
-        (struct phy_cmd[]) { /* config */
-        /* Override PHY config settings */
-                /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
-                {miim_end,}
-        },
-        (struct phy_cmd[]) { /* startup */
-                /* Read the Status (2x to make sure link is right) */
-                {MIIM_STATUS, miim_read, NULL},
-                /* Auto-negotiate */
-                {MIIM_STATUS, miim_read, &mii_parse_sr},
-                /* Read the status */
-                {MIIM_VSC8244_AUX_CONSTAT, miim_read, &mii_parse_vsc8244},
-                {miim_end,}
-        },
-        (struct phy_cmd[]) { /* shutdown */
-                {miim_end,}
-        },
+       0x3f1b,
+       "Vitesse VSC8244",
+       6,
+       (struct phy_cmd[]){     /* config */
+                          /* Override PHY config settings */
+                          /* Configure some basic stuff */
+                          {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Read the Status (2x to make sure link is right) */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          /* Read the status */
+                          {MIIM_VSC8244_AUX_CONSTAT, miim_read,
+                           &mii_parse_vsc8244},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 
-
 struct phy_info phy_info_dm9161 = {
        0x0181b88,
        "Davicom DM9161E",
        4,
-       (struct phy_cmd[]) { /* config */
-               {MIIM_CONTROL, MIIM_DM9161_CR_STOP, NULL},
-               /* Do not bypass the scrambler/descrambler */
-               {MIIM_DM9161_SCR, MIIM_DM9161_SCR_INIT, NULL},
-               /* Clear 10BTCSR to default */
-               {MIIM_DM9161_10BTCSR, MIIM_DM9161_10BTCSR_INIT, NULL},
-               /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CR_INIT, NULL},
-               /* Restart Auto Negotiation */
-               {MIIM_CONTROL, MIIM_DM9161_CR_RSTAN, NULL},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* startup */
-               /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, &mii_parse_sr},
-               /* Read the status */
-               {MIIM_DM9161_SCSR, miim_read, &mii_parse_dm9161_scsr},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* shutdown */
-               {miim_end,}
-       },
+       (struct phy_cmd[]){     /* config */
+                          {MIIM_CONTROL, MIIM_DM9161_CR_STOP, NULL},
+                          /* Do not bypass the scrambler/descrambler */
+                          {MIIM_DM9161_SCR, MIIM_DM9161_SCR_INIT, NULL},
+                          /* Clear 10BTCSR to default */
+                          {MIIM_DM9161_10BTCSR, MIIM_DM9161_10BTCSR_INIT,
+                           NULL},
+                          /* Configure some basic stuff */
+                          {MIIM_CONTROL, MIIM_CR_INIT, NULL},
+                          /* Restart Auto Negotiation */
+                          {MIIM_CONTROL, MIIM_DM9161_CR_RSTAN, NULL},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Status is read once to clear old link state */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          /* Read the status */
+                          {MIIM_DM9161_SCSR, miim_read,
+                           &mii_parse_dm9161_scsr},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 
 uint mii_parse_lxt971_sr2(uint mii_reg, struct tsec_private *priv)
@@ -1028,24 +1041,25 @@ static struct phy_info phy_info_lxt971 = {
        0x0001378e,
        "LXT971",
        4,
-       (struct phy_cmd []) {  /* config */
-               { MIIM_CR, MIIM_CR_INIT, mii_cr_init }, /* autonegotiate */
-               { miim_end, }
-       },
-       (struct phy_cmd []) {  /* startup - enable interrupts */
-               /* { 0x12, 0x00f2, NULL }, */
-               { MIIM_STATUS, miim_read, NULL },
-               { MIIM_STATUS, miim_read, &mii_parse_sr },
-               { MIIM_LXT971_SR2, miim_read, &mii_parse_lxt971_sr2 },
-               { miim_end, }
-       },
-       (struct phy_cmd []) {  /* shutdown - disable interrupts */
-               { miim_end, }
-       },
+       (struct phy_cmd[]){     /* config */
+                          {MIIM_CR, MIIM_CR_INIT, mii_cr_init},        /* autonegotiate */
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup - enable interrupts */
+                          /* { 0x12, 0x00f2, NULL }, */
+                          {MIIM_STATUS, miim_read, NULL},
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          {MIIM_LXT971_SR2, miim_read, &mii_parse_lxt971_sr2},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown - disable interrupts */
+                          {miim_end,}
+                          },
 };
 
 /* Parse the DP83865's link and auto-neg status register for speed and duplex
- * information */
+ * information
+ */
 uint mii_parse_dp83865_lanr(uint mii_reg, struct tsec_private *priv)
 {
        switch (mii_reg & MIIM_DP83865_SPD_MASK) {
@@ -1076,22 +1090,23 @@ struct phy_info phy_info_dp83865 = {
        0x20005c7,
        "NatSemi DP83865",
        4,
-       (struct phy_cmd[]) { /* config */
-               {MIIM_CONTROL, MIIM_DP83865_CR_INIT, NULL},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* startup */
-               /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, &mii_parse_sr},
-               /* Read the link and auto-neg status */
-               {MIIM_DP83865_LANR, miim_read, &mii_parse_dp83865_lanr},
-               {miim_end,}
-       },
-       (struct phy_cmd[]) { /* shutdown */
-               {miim_end,}
-       },
+       (struct phy_cmd[]){     /* config */
+                          {MIIM_CONTROL, MIIM_DP83865_CR_INIT, NULL},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* startup */
+                          /* Status is read once to clear old link state */
+                          {MIIM_STATUS, miim_read, NULL},
+                          /* Auto-negotiate */
+                          {MIIM_STATUS, miim_read, &mii_parse_sr},
+                          /* Read the link and auto-neg status */
+                          {MIIM_DP83865_LANR, miim_read,
+                           &mii_parse_dp83865_lanr},
+                          {miim_end,}
+                          },
+       (struct phy_cmd[]){     /* shutdown */
+                          {miim_end,}
+                          },
 };
 
 struct phy_info *phy_info[] = {
@@ -1109,11 +1124,11 @@ struct phy_info *phy_info[] = {
        NULL
 };
 
-
 /* Grab the identifier of the device's PHY, and search through
  * all of the known PHYs to see if one matches.         If so, return
- * it, if not, return NULL */
-struct phy_info * get_phy_info(struct eth_device *dev)
+ * it, if not, return NULL
+ */
+struct phy_info *get_phy_info(struct eth_device *dev)
 {
        struct tsec_private *priv = (struct tsec_private *)dev->priv;
        uint phy_reg, phy_ID;
@@ -1130,13 +1145,12 @@ struct phy_info * get_phy_info(struct eth_device *dev)
 
        /* loop through all the known PHY types, and find one that */
        /* matches the ID we read from the PHY. */
-       for(i=0; phy_info[i]; i++) {
-               if(phy_info[i]->id == (phy_ID >> phy_info[i]->shift))
+       for (i = 0; phy_info[i]; i++) {
+               if (phy_info[i]->id == (phy_ID >> phy_info[i]->shift))
                        theInfo = phy_info[i];
        }
 
-       if(theInfo == NULL)
-       {
+       if (theInfo == NULL) {
                printf("%s: PHY id %x is not supported!\n", dev->name, phy_ID);
                return NULL;
        } else {
@@ -1146,9 +1160,9 @@ struct phy_info * get_phy_info(struct eth_device *dev)
        return theInfo;
 }
 
-
 /* Execute the given series of commands on the given device's
- * PHY, running functions as necessary*/
+ * PHY, running functions as necessary
+ */
 void phy_run_commands(struct tsec_private *priv, struct phy_cmd *cmd)
 {
        int i;
@@ -1159,18 +1173,18 @@ void phy_run_commands(struct tsec_private *priv, struct phy_cmd *cmd)
 
        phyregs->miimcfg = MIIMCFG_INIT_VALUE;
 
-       while(phyregs->miimind & MIIMIND_BUSY);
+       while (phyregs->miimind & MIIMIND_BUSY) ;
 
-       for(i=0;cmd->mii_reg != miim_end;i++) {
-               if(cmd->mii_data == miim_read) {
+       for (i = 0; cmd->mii_reg != miim_end; i++) {
+               if (cmd->mii_data == miim_read) {
                        result = read_phy_reg(priv, cmd->mii_reg);
 
-                       if(cmd->funct != NULL)
-                               (*(cmd->funct))(result, priv);
+                       if (cmd->funct != NULL)
+                               (*(cmd->funct)) (result, priv);
 
                } else {
-                       if(cmd->funct != NULL)
-                               result = (*(cmd->funct))(cmd->mii_reg, priv);
+                       if (cmd->funct != NULL)
+                               result = (*(cmd->funct)) (cmd->mii_reg, priv);
                        else
                                result = cmd->mii_data;
 
@@ -1181,37 +1195,38 @@ void phy_run_commands(struct tsec_private *priv, struct phy_cmd *cmd)
        }
 }
 
-
 /* Relocate the function pointers in the phy cmd lists */
 static void relocate_cmds(void)
 {
        struct phy_cmd **cmdlistptr;
        struct phy_cmd *cmd;
-       int i,j,k;
+       int i, j, k;
 
-       for(i=0; phy_info[i]; i++) {
+       for (i = 0; phy_info[i]; i++) {
                /* First thing's first: relocate the pointers to the
                 * PHY command structures (the structs were done) */
-               phy_info[i] = (struct phy_info *) ((uint)phy_info[i]
-                               + gd->reloc_off);
+               phy_info[i] = (struct phy_info *)((uint) phy_info[i]
+                                                 + gd->reloc_off);
                phy_info[i]->name += gd->reloc_off;
                phy_info[i]->config =
-                       (struct phy_cmd *)((uint)phy_info[i]->config
-                                          + gd->reloc_off);
+                   (struct phy_cmd *)((uint) phy_info[i]->config
+                                      + gd->reloc_off);
                phy_info[i]->startup =
-                       (struct phy_cmd *)((uint)phy_info[i]->startup
-                                          + gd->reloc_off);
+                   (struct phy_cmd *)((uint) phy_info[i]->startup
+                                      + gd->reloc_off);
                phy_info[i]->shutdown =
-                       (struct phy_cmd *)((uint)phy_info[i]->shutdown
-                                          + gd->reloc_off);
+                   (struct phy_cmd *)((uint) phy_info[i]->shutdown
+                                      + gd->reloc_off);
 
                cmdlistptr = &phy_info[i]->config;
-               j=0;
-               for(;cmdlistptr <= &phy_info[i]->shutdown;cmdlistptr++) {
-                       k=0;
-                       for(cmd=*cmdlistptr;cmd->mii_reg != miim_end;cmd++) {
+               j = 0;
+               for (; cmdlistptr <= &phy_info[i]->shutdown; cmdlistptr++) {
+                       k = 0;
+                       for (cmd = *cmdlistptr;
+                            cmd->mii_reg != miim_end;
+                            cmd++) {
                                /* Only relocate non-NULL pointers */
-                               if(cmd->funct)
+                               if (cmd->funct)
                                        cmd->funct += gd->reloc_off;
 
                                k++;
@@ -1223,16 +1238,15 @@ static void relocate_cmds(void)
        relocated = 1;
 }
 
-
 #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) \
        && !defined(BITBANGMII)
 
-struct tsec_private * get_priv_for_phy(unsigned char phyaddr)
+struct tsec_private *get_priv_for_phy(unsigned char phyaddr)
 {
        int i;
 
-       for(i=0;i<MAXCONTROLLERS;i++) {
-               if(privlist[i]->phyaddr == phyaddr)
+       for (i = 0; i < MAXCONTROLLERS; i++) {
+               if (privlist[i]->phyaddr == phyaddr)
                        return privlist[i];
        }
 
@@ -1246,12 +1260,12 @@ struct tsec_private * get_priv_for_phy(unsigned char phyaddr)
  *  0 on success
  */
 static int tsec_miiphy_read(char *devname, unsigned char addr,
-               unsigned char reg, unsigned short *value)
+                           unsigned char reg, unsigned short *value)
 {
        unsigned short ret;
        struct tsec_private *priv = get_priv_for_phy(addr);
 
-       if(NULL == priv) {
+       if (NULL == priv) {
                printf("Can't read PHY at address %d\n", addr);
                return -1;
        }
@@ -1269,11 +1283,11 @@ static int tsec_miiphy_read(char *devname, unsigned char addr,
  *  0 on success
  */
 static int tsec_miiphy_write(char *devname, unsigned char addr,
-               unsigned char reg, unsigned short value)
+                            unsigned char reg, unsigned short value)
 {
        struct tsec_private *priv = get_priv_for_phy(addr);
 
-       if(NULL == priv) {
+       if (NULL == priv) {
                printf("Can't write PHY at address %d\n", addr);
                return -1;
        }