net: fec_mxc: use fec_set_dev_name to set name

[karo-tx-uboot.git] / drivers / net / xilinx_emaclite.c

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index bb4fb01a55a380de25dc4dd2d79cd6c018fa9374..d890d6045378371eb7fc4d5ecda2f7d4f49bf507 100644 (file)
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -28,6 +28,9 @@
 #include <config.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <fdtdec.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 #undef DEBUG
 
@@ -199,7 +202,7 @@ static int xemaclite_txbufferavailable(struct eth_device *dev)
        return !(txpingbusy && txpongbusy);
 }
 
-static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len)
+static int emaclite_send(struct eth_device *dev, void *ptr, int len)
 {
        u32 reg;
        u32 baseaddress;
@@ -240,7 +243,7 @@ static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len)
 
                debug("Send packet from 0x%x\n", baseaddress);
                /* Write the frame to the buffer */
-               xemaclite_alignedwrite((void *) ptr, baseaddress, len);
+               xemaclite_alignedwrite(ptr, baseaddress, len);
                out_be32 (baseaddress + XEL_TPLR_OFFSET,(len &
                        (XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO)));
                reg = in_be32 (baseaddress + XEL_TSR_OFFSET);
@@ -261,7 +264,7 @@ static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len)
                                & XEL_TSR_XMIT_ACTIVE_MASK) == 0)) {
                        debug("Send packet from 0x%x\n", baseaddress);
                        /* Write the frame to the buffer */
-                       xemaclite_alignedwrite((void *) ptr, baseaddress, len);
+                       xemaclite_alignedwrite(ptr, baseaddress, len);
                        out_be32 (baseaddress + XEL_TPLR_OFFSET, (len &
                                (XEL_TPLR_LENGTH_MASK_HI |
                                        XEL_TPLR_LENGTH_MASK_LO)));
@@ -342,7 +345,8 @@ static int emaclite_recv(struct eth_device *dev)
 
 }
 
-int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
+int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
+                                                       int txpp, int rxpp)
 {
        struct eth_device *dev;
        struct xemaclite *emaclite;
@@ -359,14 +363,10 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
 
        dev->priv = emaclite;
 
-#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
-       emaclite->txpp = 1;
-#endif
-#ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
-       emaclite->rxpp = 1;
-#endif
+       emaclite->txpp = txpp;
+       emaclite->rxpp = rxpp;
 
-       sprintf(dev->name, "Xelite.%x", base_addr);
+       sprintf(dev->name, "Xelite.%lx", base_addr);
 
        dev->iobase = base_addr;
        dev->init = emaclite_init;
@@ -378,3 +378,30 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
 
        return 1;
 }
+
+#ifdef CONFIG_OF_CONTROL
+int xilinx_emaclite_init(bd_t *bis)
+{
+       int offset = 0;
+       u32 ret = 0;
+       u32 reg;
+
+       do {
+               offset = fdt_node_offset_by_compatible(gd->fdt_blob, offset,
+                                       "xlnx,xps-ethernetlite-1.00.a");
+               if (offset != -1) {
+                       reg = fdtdec_get_addr(gd->fdt_blob, offset, "reg");
+                       if (reg != FDT_ADDR_T_NONE) {
+                               u32 rxpp = fdtdec_get_int(gd->fdt_blob, offset,
+                                                       "xlnx,rx-ping-pong", 0);
+                               u32 txpp = fdtdec_get_int(gd->fdt_blob, offset,
+                                                       "xlnx,tx-ping-pong", 0);
+                               ret |= xilinx_emaclite_initialize(bis, reg,
+                                                               txpp, rxpp);
+                       }
+               }
+       } while (offset != -1);
+
+       return ret;
+}
+#endif