projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 843efb1)
MPC512x FEC: get rid of duplicated struct ethernet_regs
authorWolfgang Denk <wd@denx.de>
Sat, 16 May 2009 08:47:44 +0000 (10:47 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Jun 2009 18:47:16 +0000 (20:47 +0200)
Use existing struct fec512x instead.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: John Rigby <jcrigby@gmail.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
drivers/net/mpc512x_fec.c patch | blob | history
drivers/net/mpc512x_fec.h patch | blob | history

diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c
index 54225e1eb16a4d9e03d925cfc926307061380683..62931d1c99823b20a0af33733346c467952bf605 100644 (file)
--- a/drivers/net/mpc512x_fec.c
+++ b/drivers/net/mpc512x_fec.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2003-2007
+ * (C) Copyright 2003-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * Derived from the MPC8xx FEC driver.
@@ -613,6 +613,7 @@ static int mpc512x_fec_recv (struct eth_device *dev)
 /********************************************************************/
 int mpc512x_fec_initialize (bd_t * bis)
 {
+       volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
        mpc512x_fec_priv *fec;
        struct eth_device *dev;
        int i;
@@ -623,7 +624,7 @@ int mpc512x_fec_initialize (bd_t * bis)
        dev = (struct eth_device *) malloc (sizeof(*dev));
        memset (dev, 0, sizeof *dev);
 
-       fec->eth = (ethernet_regs *) MPC512X_FEC;
+       fec->eth = &im->fec;
 
 # ifndef CONFIG_FEC_10MBIT
        fec->xcv_type = MII100;
@@ -631,7 +632,7 @@ int mpc512x_fec_initialize (bd_t * bis)
        fec->xcv_type = MII10;
 # endif
        dev->priv = (void *)fec;
-       dev->iobase = MPC512X_FEC;
+       dev->iobase = (int)&im->fec;
        dev->init = mpc512x_fec_init;
        dev->halt = mpc512x_fec_halt;
        dev->send = mpc512x_fec_send;
@@ -692,7 +693,8 @@ int mpc512x_fec_initialize (bd_t * bis)
 /********************************************************************/
 int fec512x_miiphy_read (char *devname, uint8 phyAddr, uint8 regAddr, uint16 * retVal)
 {
-       ethernet_regs *eth = (ethernet_regs *) MPC512X_FEC;
+       volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
+       volatile fec512x_t *eth = &im->fec;
        uint32 reg;             /* convenient holder for the PHY register */
        uint32 phy;             /* convenient holder for the PHY */
        int timeout = 0xffff;
@@ -738,7 +740,8 @@ int fec512x_miiphy_read (char *devname, uint8 phyAddr, uint8 regAddr, uint16 * r
 /********************************************************************/
 int fec512x_miiphy_write (char *devname, uint8 phyAddr, uint8 regAddr, uint16 data)
 {
-       ethernet_regs *eth = (ethernet_regs *) MPC512X_FEC;
+       volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
+       volatile fec512x_t *eth = &im->fec;
        uint32 reg;             /* convenient holder for the PHY register */
        uint32 phy;             /* convenient holder for the PHY */
        int timeout = 0xffff;
diff --git a/drivers/net/mpc512x_fec.h b/drivers/net/mpc512x_fec.h
index 9c385028708e39d7b9c1a21e6afc15d36eb5740f..f24f529a7934c7fa2aec08b91cf0dee525b10d64 100644 (file)
--- a/drivers/net/mpc512x_fec.h
+++ b/drivers/net/mpc512x_fec.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2003 - 2007
+ * (C) Copyright 2003 - 2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * Derived from the MPC8xx driver's header file.
@@ -15,130 +15,6 @@ typedef unsigned long uint32;
 typedef unsigned short uint16;
 typedef unsigned char uint8;
 
-typedef struct ethernet_register_set {
-
-/* [10:2]addr = 00 */
-
-/*  Control and status Registers (offset 000-1FF) */
-
-       volatile uint32 fec_id;                 /* MBAR_ETH + 0x000 */
-       volatile uint32 ievent;                 /* MBAR_ETH + 0x004 */
-       volatile uint32 imask;                  /* MBAR_ETH + 0x008 */
-
-       volatile uint32 RES0[1];                /* MBAR_ETH + 0x00C */
-       volatile uint32 r_des_active;           /* MBAR_ETH + 0x010 */
-       volatile uint32 x_des_active;           /* MBAR_ETH + 0x014 */
-
-       volatile uint32 RES1[3];                /* MBAR_ETH + 0x018-020 */
-       volatile uint32 ecntrl;                 /* MBAR_ETH + 0x024 */
-
-       volatile uint32 RES2[6];                /* MBAR_ETH + 0x028-03C */
-       volatile uint32 mii_data;               /* MBAR_ETH + 0x040 */
-       volatile uint32 mii_speed;              /* MBAR_ETH + 0x044 */
-
-       volatile uint32 RES3[7];                /* MBAR_ETH + 0x048-060 */
-       volatile uint32 mib_control;            /* MBAR_ETH + 0x064 */
-
-       volatile uint32 RES4[7];                /* MBAR_ETH + 0x068-80 */
-       volatile uint32 r_cntrl;                /* MBAR_ETH + 0x084 */
-       volatile uint32 r_hash;                 /* MBAR_ETH + 0x088 */
-
-       volatile uint32 RES5[14];               /* MBAR_ETH + 0x08c-0C0 */
-       volatile uint32 x_cntrl;                /* MBAR_ETH + 0x0C4 */
-
-       volatile uint32 RES6[7];                /* MBAR_ETH + 0x0C8-0E0 */
-       volatile uint32 paddr1;                 /* MBAR_ETH + 0x0E4 */
-       volatile uint32 paddr2;                 /* MBAR_ETH + 0x0E8 */
-       volatile uint32 op_pause;               /* MBAR_ETH + 0x0EC */
-
-       volatile uint32 RES7[10];               /* MBAR_ETH + 0x0F0-114 */
-       volatile uint32 iaddr1;                 /* MBAR_ETH + 0x118 */
-       volatile uint32 iaddr2;                 /* MBAR_ETH + 0x11C */
-       volatile uint32 gaddr1;                 /* MBAR_ETH + 0x120 */
-       volatile uint32 gaddr2;                 /* MBAR_ETH + 0x124 */
-
-       volatile uint32 RES8[6];                /* MBAR_ETH + 0x128-13C */
-       volatile uint32 fifo_id;                /* MBAR_ETH + 0x140 */
-       volatile uint32 x_wmrk;                 /* MBAR_ETH + 0x144 */
-       volatile uint32 RES9[1];                /* MBAR_ETH + 0x148 */
-       volatile uint32 r_bound;                /* MBAR_ETH + 0x14C */
-       volatile uint32 r_fstart;               /* MBAR_ETH + 0x150 */
-
-       volatile uint32 RES10[11];              /* MBAR_ETH + 0x154-17C */
-       volatile uint32 r_des_start;            /* MBAR_ETH + 0x180 */
-       volatile uint32 x_des_start;            /* MBAR_ETH + 0x184 */
-       volatile uint32 r_buff_size;            /* MBAR_ETH + 0x188 */
-       volatile uint32 RES11[26];              /* MBAR_ETH + 0x18C-1F0 */
-       volatile uint32 dma_control;            /* MBAR_ETH + 0x1F4 */
-       volatile uint32 RES12[2];               /* MBAR_ETH + 0x1F8-1FC */
-
-/*  MIB COUNTERS (Offset 200-2FF) */
-
-       volatile uint32 rmon_t_drop;            /* MBAR_ETH + 0x200 */
-       volatile uint32 rmon_t_packets;         /* MBAR_ETH + 0x204 */
-       volatile uint32 rmon_t_bc_pkt;          /* MBAR_ETH + 0x208 */
-       volatile uint32 rmon_t_mc_pkt;          /* MBAR_ETH + 0x20C */
-       volatile uint32 rmon_t_crc_align;       /* MBAR_ETH + 0x210 */
-       volatile uint32 rmon_t_undersize;       /* MBAR_ETH + 0x214 */
-       volatile uint32 rmon_t_oversize;        /* MBAR_ETH + 0x218 */
-       volatile uint32 rmon_t_frag;            /* MBAR_ETH + 0x21C */
-       volatile uint32 rmon_t_jab;             /* MBAR_ETH + 0x220 */
-       volatile uint32 rmon_t_col;             /* MBAR_ETH + 0x224 */
-       volatile uint32 rmon_t_p64;             /* MBAR_ETH + 0x228 */
-       volatile uint32 rmon_t_p65to127;        /* MBAR_ETH + 0x22C */
-       volatile uint32 rmon_t_p128to255;       /* MBAR_ETH + 0x230 */
-       volatile uint32 rmon_t_p256to511;       /* MBAR_ETH + 0x234 */
-       volatile uint32 rmon_t_p512to1023;      /* MBAR_ETH + 0x238 */
-       volatile uint32 rmon_t_p1024to2047;     /* MBAR_ETH + 0x23C */
-       volatile uint32 rmon_t_p_gte2048;       /* MBAR_ETH + 0x240 */
-       volatile uint32 rmon_t_octets;          /* MBAR_ETH + 0x244 */
-       volatile uint32 ieee_t_drop;            /* MBAR_ETH + 0x248 */
-       volatile uint32 ieee_t_frame_ok;        /* MBAR_ETH + 0x24C */
-       volatile uint32 ieee_t_1col;            /* MBAR_ETH + 0x250 */
-       volatile uint32 ieee_t_mcol;            /* MBAR_ETH + 0x254 */
-       volatile uint32 ieee_t_def;             /* MBAR_ETH + 0x258 */
-       volatile uint32 ieee_t_lcol;            /* MBAR_ETH + 0x25C */
-       volatile uint32 ieee_t_excol;           /* MBAR_ETH + 0x260 */
-       volatile uint32 ieee_t_macerr;          /* MBAR_ETH + 0x264 */
-       volatile uint32 ieee_t_cserr;           /* MBAR_ETH + 0x268 */
-       volatile uint32 ieee_t_sqe;             /* MBAR_ETH + 0x26C */
-       volatile uint32 t_fdxfc;                /* MBAR_ETH + 0x270 */
-       volatile uint32 ieee_t_octets_ok;       /* MBAR_ETH + 0x274 */
-
-       volatile uint32 RES13[2];               /* MBAR_ETH + 0x278-27C */
-       volatile uint32 rmon_r_drop;            /* MBAR_ETH + 0x280 */
-       volatile uint32 rmon_r_packets;         /* MBAR_ETH + 0x284 */
-       volatile uint32 rmon_r_bc_pkt;          /* MBAR_ETH + 0x288 */
-       volatile uint32 rmon_r_mc_pkt;          /* MBAR_ETH + 0x28C */
-       volatile uint32 rmon_r_crc_align;       /* MBAR_ETH + 0x290 */
-       volatile uint32 rmon_r_undersize;       /* MBAR_ETH + 0x294 */
-       volatile uint32 rmon_r_oversize;        /* MBAR_ETH + 0x298 */
-       volatile uint32 rmon_r_frag;            /* MBAR_ETH + 0x29C */
-       volatile uint32 rmon_r_jab;             /* MBAR_ETH + 0x2A0 */
-
-       volatile uint32 rmon_r_resvd_0;         /* MBAR_ETH + 0x2A4 */
-
-       volatile uint32 rmon_r_p64;             /* MBAR_ETH + 0x2A8 */
-       volatile uint32 rmon_r_p65to127;        /* MBAR_ETH + 0x2AC */
-       volatile uint32 rmon_r_p128to255;       /* MBAR_ETH + 0x2B0 */
-       volatile uint32 rmon_r_p256to511;       /* MBAR_ETH + 0x2B4 */
-       volatile uint32 rmon_r_p512to1023;      /* MBAR_ETH + 0x2B8 */
-       volatile uint32 rmon_r_p1024to2047;     /* MBAR_ETH + 0x2BC */
-       volatile uint32 rmon_r_p_gte2048;       /* MBAR_ETH + 0x2C0 */
-       volatile uint32 rmon_r_octets;          /* MBAR_ETH + 0x2C4 */
-       volatile uint32 ieee_r_drop;            /* MBAR_ETH + 0x2C8 */
-       volatile uint32 ieee_r_frame_ok;        /* MBAR_ETH + 0x2CC */
-       volatile uint32 ieee_r_crc;             /* MBAR_ETH + 0x2D0 */
-       volatile uint32 ieee_r_align;           /* MBAR_ETH + 0x2D4 */
-       volatile uint32 r_macerr;               /* MBAR_ETH + 0x2D8 */
-       volatile uint32 r_fdxfc;                /* MBAR_ETH + 0x2DC */
-       volatile uint32 ieee_r_octets_ok;       /* MBAR_ETH + 0x2E0 */
-
-       volatile uint32 RES14[6];               /* MBAR_ETH + 0x2E4-2FC */
-
-       volatile uint32 RES15[64];              /* MBAR_ETH + 0x300-3FF */
-} ethernet_regs;
-
 /* Receive & Transmit Buffer Descriptor definitions */
 typedef struct BufferDescriptor {
        uint16 status;
@@ -180,7 +56,7 @@ typedef struct {
 } mpc512x_buff_descs;
 
 typedef struct {
-       ethernet_regs *eth;
+       volatile fec512x_t *eth;
        xceiver_type xcv_type;          /* transceiver type */
        mpc512x_buff_descs *bdBase;     /* BD rings and recv buffer */
        uint16 rbdIndex;                /* next receive BD to read */
Broadcom-s U-Boot