]> git.sur5r.net Git - u-boot/commitdiff
ColdFire: Remove platforms mii.c file
authorTsiChung Liew <Tsi-Chung.Liew@freescale.com>
Tue, 21 Oct 2008 12:15:44 +0000 (12:15 +0000)
committerJohn Rigby <jrigby@freescale.com>
Mon, 3 Nov 2008 16:45:58 +0000 (09:45 -0700)
Will use mcfmii.c driver in drivers/net rather than
keep creating new mii.c for each future platform.
Remove EB+MCF-EV123, cobra5272, idmr, M5235EVB,
M5271EVB, M5272C3, M5275EVB, M5282EVB, M5329EVB,
M5373EVB, M54451EVB, M54455EVB, M547xEVB, and M548xEVB's
mii.c

Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
28 files changed:
board/BuS/EB+MCF-EV123/Makefile
board/BuS/EB+MCF-EV123/mii.c [deleted file]
board/cobra5272/Makefile
board/cobra5272/mii.c [deleted file]
board/freescale/m5235evb/Makefile
board/freescale/m5235evb/mii.c [deleted file]
board/freescale/m5271evb/Makefile
board/freescale/m5271evb/mii.c [deleted file]
board/freescale/m5272c3/Makefile
board/freescale/m5272c3/mii.c [deleted file]
board/freescale/m5275evb/Makefile
board/freescale/m5275evb/mii.c [deleted file]
board/freescale/m5282evb/Makefile
board/freescale/m5282evb/mii.c [deleted file]
board/freescale/m5329evb/Makefile
board/freescale/m5329evb/mii.c [deleted file]
board/freescale/m5373evb/Makefile
board/freescale/m5373evb/mii.c [deleted file]
board/freescale/m54451evb/Makefile
board/freescale/m54451evb/mii.c [deleted file]
board/freescale/m54455evb/Makefile
board/freescale/m54455evb/mii.c [deleted file]
board/freescale/m547xevb/Makefile
board/freescale/m547xevb/mii.c [deleted file]
board/freescale/m548xevb/Makefile
board/freescale/m548xevb/mii.c [deleted file]
board/idmr/Makefile
board/idmr/mii.c [deleted file]

index ceeffa77532f07d529497c19633314381d7e41d5..ed3ac0755898a2c5b516fd21868456f659f3bc5d 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o cfm_flash.o flash.o VCxK.o mii.o
+COBJS  = $(BOARD).o cfm_flash.o flash.o VCxK.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/BuS/EB+MCF-EV123/mii.c b/board/BuS/EB+MCF-EV123/mii.c
deleted file mode 100644 (file)
index 7f92514..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       if (setclear) {
-               MCFGPIO_PASPAR |= 0x0F00;
-               MCFGPIO_PEHLPAR = CONFIG_SYS_PEHLPAR;
-       } else {
-               MCFGPIO_PASPAR &= 0xF0FF;
-               MCFGPIO_PEHLPAR &= ~CONFIG_SYS_PEHLPAR;
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_AMD79C874VC     0x0022561B      /* AMD 79C874 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_AMD79C874VC     "AMD79C874VC"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       strcpy(info->phy_name,
-                                              STR_ID_AMD79C874VC);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       printf(STR_ID_AMD79C874VC);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index be704b76f0c11864d77c7ae9c040a2e8cdea4151..cf07cf40fdb9485240118667e0b22074acd7516d 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o flash.o mii.o
+COBJS  = $(BOARD).o flash.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/cobra5272/mii.c b/board/cobra5272/mii.c
deleted file mode 100644 (file)
index 161c694..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-
-       if (setclear) {
-               gpio->gpio_pbcnt |= GPIO_PBCNT_E_MDC | GPIO_PBCNT_E_RXER | GPIO_PBCNT_E_RXD1 | GPIO_PBCNT_E_RXD2 | GPIO_PBCNT_E_RXD3 | GPIO_PBCNT_E_TXD1 | GPIO_PBCNT_E_TXD2 | GPIO_PBCNT_E_TXD3;
-       } else {
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_AMD79C874VC     0x0022561B      /* AMD 79C874 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_AMD79C874VC     "AMD79C874VC"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       strcpy(info->phy_name,
-                                              STR_ID_AMD79C874VC);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       printf(STR_ID_AMD79C874VC);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 74c252869824083832178a7e03b8201b76e0e81c..981763d205ca70ece9f60df14e99c235f425cc3e 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m5235evb/mii.c b/board/freescale/m5235evb/mii.c
deleted file mode 100644 (file)
index 5fbbd66..0000000
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-
-       if (setclear) {
-               gpio->par_feci2c |=
-                   (GPIO_PAR_FECI2C_EMDC_FECEMDC | GPIO_PAR_FECI2C_EMDIO_FECEMDIO);
-       } else {
-               gpio->par_feci2c &=
-                   ~(GPIO_PAR_FECI2C_EMDC_MASK | GPIO_PAR_FECI2C_EMDIO_MASK);
-       }
-
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-#define PHY_ID_KS8721BL                0x00221619      /* Micrel KS8721BL/SL */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-#define STR_ID_KS8721BL                "KS8721BL"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || (CONFIG_MII) */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       strcpy(info->phy_name,
-                                              STR_ID_KS8721BL);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       printf(STR_ID_KS8721BL);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 2ec71ee1d2711a631bc7bf7e6d84357b9d02db95..424ab1cf9e3251575e95a3faf767cfc87b765cf2 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m5271evb/mii.c b/board/freescale/m5271evb/mii.c
deleted file mode 100644 (file)
index e79fa19..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       if (setclear) {
-               /* Enable Ethernet pins */
-               mbar_writeByte(MCF_GPIO_PAR_FECI2C, CONFIG_SYS_FECI2C);
-       } else {
-       }
-
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-#define PHY_ID_KS8721BL                0x00221619      /* Micrel KS8721BL/SL */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-#define STR_ID_KS8721BL                "KS8721BL"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       strcpy(info->phy_name,
-                                              STR_ID_KS8721BL);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       printf(STR_ID_KS8721BL);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index be704b76f0c11864d77c7ae9c040a2e8cdea4151..cf07cf40fdb9485240118667e0b22074acd7516d 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o flash.o mii.o
+COBJS  = $(BOARD).o flash.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m5272c3/mii.c b/board/freescale/m5272c3/mii.c
deleted file mode 100644 (file)
index 161c694..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-
-       if (setclear) {
-               gpio->gpio_pbcnt |= GPIO_PBCNT_E_MDC | GPIO_PBCNT_E_RXER | GPIO_PBCNT_E_RXD1 | GPIO_PBCNT_E_RXD2 | GPIO_PBCNT_E_RXD3 | GPIO_PBCNT_E_TXD1 | GPIO_PBCNT_E_TXD2 | GPIO_PBCNT_E_TXD3;
-       } else {
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_AMD79C874VC     0x0022561B      /* AMD 79C874 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_AMD79C874VC     "AMD79C874VC"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       strcpy(info->phy_name,
-                                              STR_ID_AMD79C874VC);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       printf(STR_ID_AMD79C874VC);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 74c252869824083832178a7e03b8201b76e0e81c..981763d205ca70ece9f60df14e99c235f425cc3e 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m5275evb/mii.c b/board/freescale/m5275evb/mii.c
deleted file mode 100644 (file)
index 706d8d6..0000000
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       struct fec_info_s *info = (struct fec_info_s *) dev->priv;
-       volatile gpio_t *gpio = (gpio_t *)MMAP_GPIO;
-
-       if (setclear) {
-               /* Enable Ethernet pins */
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE) {
-                       gpio->par_feci2c |= 0x0F00;
-                       gpio->par_fec0hl |= 0xC0;
-               } else {
-                       gpio->par_feci2c |= 0x00A0;
-                       gpio->par_fec1hl |= 0xC0;
-               }
-       } else {
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE) {
-                       gpio->par_feci2c &= ~0x0F00;
-                       gpio->par_fec0hl &= ~0xC0;
-               } else {
-                       gpio->par_feci2c &= ~0x00A0;
-                       gpio->par_fec1hl &= ~0xC0;
-               }
-       }
-
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-#define PHY_ID_KS8721BL                0x00221619      /* Micrel KS8721BL/SL */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-#define STR_ID_KS8721BL                "KS8721BL"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif /* CONFIG_SYS_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       strcpy(info->phy_name,
-                                              STR_ID_KS8721BL);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       printf(STR_ID_KS8721BL);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 2ec71ee1d2711a631bc7bf7e6d84357b9d02db95..424ab1cf9e3251575e95a3faf767cfc87b765cf2 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m5282evb/mii.c b/board/freescale/m5282evb/mii.c
deleted file mode 100644 (file)
index 7f92514..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       if (setclear) {
-               MCFGPIO_PASPAR |= 0x0F00;
-               MCFGPIO_PEHLPAR = CONFIG_SYS_PEHLPAR;
-       } else {
-               MCFGPIO_PASPAR &= 0xF0FF;
-               MCFGPIO_PEHLPAR &= ~CONFIG_SYS_PEHLPAR;
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_AMD79C874VC     0x0022561B      /* AMD 79C874 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_AMD79C874VC     "AMD79C874VC"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       strcpy(info->phy_name,
-                                              STR_ID_AMD79C874VC);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_AMD79C874VC:
-                                       printf(STR_ID_AMD79C874VC);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index ab0f11e9d0f569c1a0f3a1909157423fea0c095b..07b693c13eadde1f16d2457358757731daffe2df 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o nand.o
+COBJS  = $(BOARD).o nand.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m5329evb/mii.c b/board/freescale/m5329evb/mii.c
deleted file mode 100644 (file)
index c0f5817..0000000
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-
-       if (setclear) {
-               gpio->par_fec |= GPIO_PAR_FEC_7W_FEC | GPIO_PAR_FEC_MII_FEC;
-               gpio->par_feci2c |=
-                   GPIO_PAR_FECI2C_MDC_EMDC | GPIO_PAR_FECI2C_MDIO_EMDIO;
-       } else {
-               gpio->par_fec &= ~(GPIO_PAR_FEC_7W_FEC | GPIO_PAR_FEC_MII_FEC);
-               gpio->par_feci2c &=
-                   ~(GPIO_PAR_FECI2C_MDC_EMDC | GPIO_PAR_FECI2C_MDIO_EMDIO);
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_DP83848VV:
-                                       strcpy(info->phy_name,
-                                              STR_ID_DP83848VV);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_DP83848VV:
-                                       printf(STR_ID_DP83848VV);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index ab0f11e9d0f569c1a0f3a1909157423fea0c095b..07b693c13eadde1f16d2457358757731daffe2df 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o nand.o
+COBJS  = $(BOARD).o nand.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m5373evb/mii.c b/board/freescale/m5373evb/mii.c
deleted file mode 100644 (file)
index c0f5817..0000000
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-
-       if (setclear) {
-               gpio->par_fec |= GPIO_PAR_FEC_7W_FEC | GPIO_PAR_FEC_MII_FEC;
-               gpio->par_feci2c |=
-                   GPIO_PAR_FECI2C_MDC_EMDC | GPIO_PAR_FECI2C_MDIO_EMDIO;
-       } else {
-               gpio->par_fec &= ~(GPIO_PAR_FEC_7W_FEC | GPIO_PAR_FEC_MII_FEC);
-               gpio->par_feci2c &=
-                   ~(GPIO_PAR_FECI2C_MDC_EMDC | GPIO_PAR_FECI2C_MDIO_EMDIO);
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_DP83848VV:
-                                       strcpy(info->phy_name,
-                                              STR_ID_DP83848VV);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_DP83848VV:
-                                       printf(STR_ID_DP83848VV);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 74c252869824083832178a7e03b8201b76e0e81c..981763d205ca70ece9f60df14e99c235f425cc3e 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m54451evb/mii.c b/board/freescale/m54451evb/mii.c
deleted file mode 100644 (file)
index 6e24736..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-       struct fec_info_s *info = (struct fec_info_s *)dev->priv;
-
-       if (setclear) {
-               gpio->par_feci2c |=
-                   (GPIO_PAR_FECI2C_MDC0_MDC0 | GPIO_PAR_FECI2C_MDIO0_MDIO0);
-
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_fec |= GPIO_PAR_FEC_FEC0_RMII_GPIO;
-               else
-                       gpio->par_fec |= GPIO_PAR_FEC_FEC1_RMII_ATA;
-       } else {
-               gpio->par_feci2c &=
-                   ~(GPIO_PAR_FECI2C_MDC0_MDC0 | GPIO_PAR_FECI2C_MDIO0_MDIO0);
-
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_fec &= GPIO_PAR_FEC_FEC0_MASK;
-               else
-                       gpio->par_fec &= GPIO_PAR_FEC_FEC1_MASK;
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_KSZ8041NL       0x00221512
-#define STR_ID_KSZ8041NL       "KSZ8041NL"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       struct eth_device *dev;
-       int i, miispd;
-       u16 rst = 0;
-
-       dev = eth_get_dev();
-
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       miiphy_write(dev->name, info->phy_addr, PHY_BMCR, PHY_BMCR_RESET);
-       for (i = 0; i < FEC_RESET_DELAY; ++i) {
-               udelay(500);
-               miiphy_read(dev->name, info->phy_addr, PHY_BMCR, &rst);
-               if ((rst & PHY_BMCR_RESET) == 0)
-                       break;
-       }
-       if (i == FEC_RESET_DELAY)
-               printf("Mii reset timeout %d\n", i);
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || (CONFIG_MII) */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KSZ8041NL:
-                                       strcpy(info->phy_name,
-                                              STR_ID_KSZ8041NL);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KSZ8041NL:
-                                       printf(STR_ID_KSZ8041NL);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__ ((weak, alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 74c252869824083832178a7e03b8201b76e0e81c..981763d205ca70ece9f60df14e99c235f425cc3e 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m54455evb/mii.c b/board/freescale/m54455evb/mii.c
deleted file mode 100644 (file)
index c195191..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-       struct fec_info_s *info = (struct fec_info_s *)dev->priv;
-
-       if (setclear) {
-               gpio->par_feci2c |=
-                   (GPIO_PAR_FECI2C_MDC0_MDC0 | GPIO_PAR_FECI2C_MDIO0_MDIO0);
-
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_fec |= GPIO_PAR_FEC_FEC0_RMII_GPIO;
-               else
-                       gpio->par_fec |= GPIO_PAR_FEC_FEC1_RMII_ATA;
-       } else {
-               gpio->par_feci2c &=
-                   ~(GPIO_PAR_FECI2C_MDC0_MDC0 | GPIO_PAR_FECI2C_MDIO0_MDIO0);
-
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_fec &= GPIO_PAR_FEC_FEC0_MASK;
-               else
-                       gpio->par_fec &= GPIO_PAR_FEC_FEC1_MASK;
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       struct eth_device *dev;
-       int i, miispd;
-       u16 rst = 0;
-
-       dev = eth_get_dev();
-
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       miiphy_write(dev->name, info->phy_addr, PHY_BMCR, PHY_BMCR_RESET);
-       for (i = 0; i < FEC_RESET_DELAY; ++i) {
-               udelay(500);
-               miiphy_read(dev->name, info->phy_addr, PHY_BMCR, &rst);
-               if ((rst & PHY_BMCR_RESET) == 0)
-                       break;
-       }
-       if (i == FEC_RESET_DELAY)
-               printf("Mii reset timeout %d\n", i);
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || (CONFIG_MII) */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_DP83848VV:
-                                       strcpy(info->phy_name,
-                                              STR_ID_DP83848VV);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_DP83848VV:
-                                       printf(STR_ID_DP83848VV);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 74c252869824083832178a7e03b8201b76e0e81c..981763d205ca70ece9f60df14e99c235f425cc3e 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m547xevb/mii.c b/board/freescale/m547xevb/mii.c
deleted file mode 100644 (file)
index 4d11506..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <config.h>
-#include <net.h>
-
-#include <asm/immap.h>
-#include <asm/fec.h>
-#include <asm/fsl_mcdmafec.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-       struct fec_info_dma *info = (struct fec_info_dma *)dev->priv;
-
-       if (setclear) {
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_feci2cirq |= 0xF000;
-               else
-                       gpio->par_feci2cirq |= 0x0FC0;
-       } else {
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_feci2cirq &= 0x0FFF;
-               else
-                       gpio->par_feci2cirq &= 0xF03F;
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-#define PHY_ID_BCM5222         0x00406322      /* Broadcom 5222 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-#define STR_ID_BCM5222         "BCM5222"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_dma *info)
-{
-       volatile fecdma_t *fecp = (fecdma_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_dma *info;
-       struct eth_device *dev;
-       volatile fecdma_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fecdma_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_dma *info = dev->priv;
-       int phyaddr, pass, temp;
-       uint phyno, phytype;
-
-       if (info->phyname_init) {
-               return info->phy_addr;
-       }
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               temp = 0;
-               if (info->index > 0) {
-                       /* Some phy have multiple address, to solve the issue
-                          where phyno keeps starting from 0, check the
-                          previous phy address if both miibase are the same. */
-                       if (info->miibase == (info->next)->miibase) {
-                               temp = (info->next)->phy_addr + 1;
-                       }
-               }
-
-               for (phyno = temp; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_BCM5222:
-                                       strcpy(info->phy_name, STR_ID_BCM5222);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_BCM5222:
-                                       printf(STR_ID_BCM5222);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__ ((weak, alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fecdma_t *fecp;
-       struct fec_info_dma *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fecdma_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index 74c252869824083832178a7e03b8201b76e0e81c..981763d205ca70ece9f60df14e99c235f425cc3e 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o mii.o
+COBJS  = $(BOARD).o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/freescale/m548xevb/mii.c b/board/freescale/m548xevb/mii.c
deleted file mode 100644 (file)
index 4d11506..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <config.h>
-#include <net.h>
-
-#include <asm/immap.h>
-#include <asm/fec.h>
-#include <asm/fsl_mcdmafec.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
-       struct fec_info_dma *info = (struct fec_info_dma *)dev->priv;
-
-       if (setclear) {
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_feci2cirq |= 0xF000;
-               else
-                       gpio->par_feci2cirq |= 0x0FC0;
-       } else {
-               if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
-                       gpio->par_feci2cirq &= 0x0FFF;
-               else
-                       gpio->par_feci2cirq &= 0xF03F;
-       }
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-#define PHY_ID_BCM5222         0x00406322      /* Broadcom 5222 */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-#define STR_ID_BCM5222         "BCM5222"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_dma *info)
-{
-       volatile fecdma_t *fecp = (fecdma_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_dma *info;
-       struct eth_device *dev;
-       volatile fecdma_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fecdma_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_dma *info = dev->priv;
-       int phyaddr, pass, temp;
-       uint phyno, phytype;
-
-       if (info->phyname_init) {
-               return info->phy_addr;
-       }
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               temp = 0;
-               if (info->index > 0) {
-                       /* Some phy have multiple address, to solve the issue
-                          where phyno keeps starting from 0, check the
-                          previous phy address if both miibase are the same. */
-                       if (info->miibase == (info->next)->miibase) {
-                               temp = (info->next)->phy_addr + 1;
-                       }
-               }
-
-               for (phyno = temp; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_BCM5222:
-                                       strcpy(info->phy_name, STR_ID_BCM5222);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_BCM5222:
-                                       printf(STR_ID_BCM5222);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__ ((weak, alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fecdma_t *fecp;
-       struct fec_info_dma *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fecdma_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
index be704b76f0c11864d77c7ae9c040a2e8cdea4151..cf07cf40fdb9485240118667e0b22074acd7516d 100644 (file)
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  = $(BOARD).o flash.o mii.o
+COBJS  = $(BOARD).o flash.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
diff --git a/board/idmr/mii.c b/board/idmr/mii.c
deleted file mode 100644 (file)
index e79fa19..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/fec.h>
-#include <asm/immap.h>
-
-#include <config.h>
-#include <net.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#undef MII_DEBUG
-#undef ET_DEBUG
-
-int fecpin_setclear(struct eth_device *dev, int setclear)
-{
-       if (setclear) {
-               /* Enable Ethernet pins */
-               mbar_writeByte(MCF_GPIO_PAR_FECI2C, CONFIG_SYS_FECI2C);
-       } else {
-       }
-
-       return 0;
-}
-
-#if defined(CONFIG_SYS_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
-#include <miiphy.h>
-
-/* Make MII read/write commands for the FEC. */
-#define mk_mii_read(ADDR, REG) (0x60020000 | ((ADDR << 23) | (REG & 0x1f) << 18))
-
-#define mk_mii_write(ADDR, REG, VAL)   (0x50020000 | ((ADDR << 23) | (REG & 0x1f) << 18) | (VAL & 0xffff))
-
-/* PHY identification */
-#define PHY_ID_LXT970          0x78100000      /* LXT970 */
-#define PHY_ID_LXT971          0x001378e0      /* LXT971 and 972 */
-#define PHY_ID_82555           0x02a80150      /* Intel 82555 */
-#define PHY_ID_QS6612          0x01814400      /* QS6612 */
-#define PHY_ID_AMD79C784       0x00225610      /* AMD 79C784 */
-#define PHY_ID_LSI80225                0x0016f870      /* LSI 80225 */
-#define PHY_ID_LSI80225B       0x0016f880      /* LSI 80225/B */
-#define PHY_ID_DP83848VV       0x20005C90      /* National 83848 */
-#define PHY_ID_DP83849         0x20005CA2      /* National 82849 */
-#define PHY_ID_KS8721BL                0x00221619      /* Micrel KS8721BL/SL */
-
-#define STR_ID_LXT970          "LXT970"
-#define STR_ID_LXT971          "LXT971"
-#define STR_ID_82555           "Intel82555"
-#define STR_ID_QS6612          "QS6612"
-#define STR_ID_AMD79C784       "AMD79C784"
-#define STR_ID_LSI80225                "LSI80225"
-#define STR_ID_LSI80225B       "LSI80225/B"
-#define STR_ID_DP83848VV       "N83848"
-#define STR_ID_DP83849         "N83849"
-#define STR_ID_KS8721BL                "KS8721BL"
-
-/****************************************************************************
- * mii_init -- Initialize the MII for MII command without ethernet
- * This function is a subset of eth_init
- ****************************************************************************
- */
-void mii_reset(struct fec_info_s *info)
-{
-       volatile fec_t *fecp = (fec_t *) (info->miibase);
-       int i;
-
-       fecp->ecr = FEC_ECR_RESET;
-       for (i = 0; (fecp->ecr & FEC_ECR_RESET) && (i < FEC_RESET_DELAY); ++i) {
-               udelay(1);
-       }
-       if (i == FEC_RESET_DELAY) {
-               printf("FEC_RESET_DELAY timeout\n");
-       }
-}
-
-/* send command to phy using mii, wait for result */
-uint mii_send(uint mii_cmd)
-{
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       volatile fec_t *ep;
-       uint mii_reply;
-       int j = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       ep = (fec_t *) info->miibase;
-
-       ep->mmfr = mii_cmd;     /* command to phy */
-
-       /* wait for mii complete */
-       while (!(ep->eir & FEC_EIR_MII) && (j < MCFFEC_TOUT_LOOP)) {
-               udelay(1);
-               j++;
-       }
-       if (j >= MCFFEC_TOUT_LOOP) {
-               printf("MII not complete\n");
-               return -1;
-       }
-
-       mii_reply = ep->mmfr;   /* result from phy */
-       ep->eir = FEC_EIR_MII;  /* clear MII complete */
-#ifdef ET_DEBUG
-       printf("%s[%d] %s: sent=0x%8.8x, reply=0x%8.8x\n",
-              __FILE__, __LINE__, __FUNCTION__, mii_cmd, mii_reply);
-#endif
-
-       return (mii_reply & 0xffff);    /* data read from phy */
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY || CONFIG_CMD_MII */
-
-#if defined(CONFIG_SYS_DISCOVER_PHY)
-int mii_discover_phy(struct eth_device *dev)
-{
-#define MAX_PHY_PASSES 11
-       struct fec_info_s *info = dev->priv;
-       int phyaddr, pass;
-       uint phyno, phytype;
-
-       if (info->phyname_init)
-               return info->phy_addr;
-
-       phyaddr = -1;           /* didn't find a PHY yet */
-       for (pass = 1; pass <= MAX_PHY_PASSES && phyaddr < 0; ++pass) {
-               if (pass > 1) {
-                       /* PHY may need more time to recover from reset.
-                        * The LXT970 needs 50ms typical, no maximum is
-                        * specified, so wait 10ms before try again.
-                        * With 11 passes this gives it 100ms to wake up.
-                        */
-                       udelay(10000);  /* wait 10ms */
-               }
-
-               for (phyno = 0; phyno < 32 && phyaddr < 0; ++phyno) {
-
-                       phytype = mii_send(mk_mii_read(phyno, PHY_PHYIDR1));
-#ifdef ET_DEBUG
-                       printf("PHY type 0x%x pass %d type\n", phytype, pass);
-#endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
-
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       strcpy(info->phy_name,
-                                              STR_ID_KS8721BL);
-                                       info->phyname_init = 1;
-                                       break;
-                               default:
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
-
-#ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d type ", phyno, pass);
-                               switch (phytype & 0xffffffff) {
-                               case PHY_ID_KS8721BL:
-                                       printf(STR_ID_KS8721BL);
-                                       break;
-                               default:
-                                       printf("0x%08x\n", phytype);
-                                       break;
-                               }
-#endif
-                       }
-               }
-       }
-       if (phyaddr < 0)
-               printf("No PHY device found.\n");
-
-       return phyaddr;
-}
-#endif                         /* CONFIG_SYS_DISCOVER_PHY */
-
-void mii_init(void) __attribute__((weak,alias("__mii_init")));
-
-void __mii_init(void)
-{
-       volatile fec_t *fecp;
-       struct fec_info_s *info;
-       struct eth_device *dev;
-       int miispd = 0, i = 0;
-       u16 autoneg = 0;
-
-       /* retrieve from register structure */
-       dev = eth_get_dev();
-       info = dev->priv;
-
-       fecp = (fec_t *) info->miibase;
-
-       fecpin_setclear(dev, 1);
-
-       mii_reset(info);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set MII speed */
-       miispd = (gd->bus_clk / 1000000) / 5;
-       fecp->mscr = miispd << 1;
-
-       info->phy_addr = mii_discover_phy(dev);
-
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
-       while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
-               i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
-                       break;
-
-               udelay(500);
-       }
-       if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
-       }
-
-       /* adapt to the half/full speed settings */
-       info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
-       info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
-}
-
-/*****************************************************************************
- * Read and write a MII PHY register, routines used by MII Utilities
- *
- * FIXME: These routines are expected to return 0 on success, but mii_send
- *       does _not_ return an error code. Maybe 0xFFFF means error, i.e.
- *       no PHY connected...
- *       For now always return 0.
- * FIXME: These routines only work after calling eth_init() at least once!
- *       Otherwise they hang in mii_send() !!! Sorry!
- *****************************************************************************/
-
-int mcffec_miiphy_read(char *devname, unsigned char addr, unsigned char reg,
-                      unsigned short *value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_read(0x%x) @ 0x%x = ", reg, addr);
-#endif
-       rdreg = mii_send(mk_mii_read(addr, reg));
-
-       *value = rdreg;
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", *value);
-#endif
-
-       return 0;
-}
-
-int mcffec_miiphy_write(char *devname, unsigned char addr, unsigned char reg,
-                       unsigned short value)
-{
-       short rdreg;            /* register working value */
-
-#ifdef MII_DEBUG
-       printf("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
-#endif
-
-       rdreg = mii_send(mk_mii_write(addr, reg, value));
-
-#ifdef MII_DEBUG
-       printf("0x%04x\n", value);
-#endif
-
-       return 0;
-}
-
-#endif                         /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */