Merge branch 'master' of git://git.denx.de/u-boot-ubi

[u-boot] / drivers / net / fec_mxc.h

diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 1ba51617ddf39fc2bb0d22e43b9477367c5a647e..8b26645173e03d8c6d4f179cf0451a12fbd5dfce 100644 (file)
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -32,6 +32,8 @@
 #ifndef __FEC_MXC_H
 #define __FEC_MXC_H
 
+void imx_get_mac_from_fuse(unsigned char *mac);
+
 /**
  * Layout description of the FEC
  */
@@ -194,6 +196,7 @@ struct ethernet_regs {
 #define FEC_RCNTRL_PROM                        0x00000008
 #define FEC_RCNTRL_BC_REJ              0x00000010
 #define FEC_RCNTRL_FCE                 0x00000020
+#define FEC_RCNTRL_RMII                        0x00000100
 
 #define FEC_TCNTRL_GTS                 0x00000001
 #define FEC_TCNTRL_HBC                 0x00000002
@@ -257,7 +260,8 @@ struct fec_bd {
 enum xceiver_type {
        SEVENWIRE,      /* 7-wire       */
        MII10,          /* MII 10Mbps   */
-       MII100          /* MII 100Mbps  */
+       MII100,         /* MII 100Mbps  */
+       RMII            /* RMII */
 };
 
 /**
@@ -273,6 +277,9 @@ struct fec_priv {
        bd_t *bd;
        void *rdb_ptr;
        void *base_ptr;
+       int dev_id;
+       int phy_id;
+       int (*mii_postcall)(int);
 };
 
 /**