i.MX6: crm_regs: define IOMUXC_GPR4/6/7

[u-boot] / drivers / net / greth.c

diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 0566e6859052542462938d50946770dff5b5070e..3103a741a195ba9d142ae9178bd8a7ff1c8610ee 100644 (file)
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -403,7 +403,7 @@ void greth_halt(struct eth_device *dev)
        }
 }
 
-int greth_send(struct eth_device *dev, volatile void *eth_data, int data_length)
+int greth_send(struct eth_device *dev, void *eth_data, int data_length)
 {
        greth_priv *greth = dev->priv;
        greth_regs *regs = greth->regs;
@@ -483,7 +483,7 @@ int greth_recv(struct eth_device *dev)
        greth_regs *regs = greth->regs;
        greth_bd *rxbd;
        unsigned int status, len = 0, bad;
-       unsigned char *d;
+       char *d;
        int enable = 0;
        int i;
 
@@ -504,7 +504,7 @@ int greth_recv(struct eth_device *dev)
                        goto done;
                }
 
-               debug("greth_recv: packet 0x%lx, 0x%lx, len: %d\n",
+               debug("greth_recv: packet 0x%x, 0x%x, len: %d\n",
                       (unsigned int)rxbd, status, status & GRETH_BD_LEN);
 
                /* Check status for errors.
@@ -576,7 +576,7 @@ int greth_recv(struct eth_device *dev)
                GRETH_REGORIN(&regs->control, GRETH_RXEN);
        }
       done:
-       /* return positive length of packet or 0 if non recieved */
+       /* return positive length of packet or 0 if non received */
        return len;
 }
 
@@ -620,7 +620,7 @@ int greth_initialize(bd_t * bis)
 
        greth->regs = (greth_regs *) apbdev.address;
        greth->irq = apbdev.irq;
-       debug("Found GRETH at 0x%lx, irq %d\n", greth->regs, greth->irq);
+       debug("Found GRETH at %p, irq %d\n", greth->regs, greth->irq);
        dev->priv = (void *)greth;
        dev->iobase = (unsigned int)greth->regs;
        dev->init = greth_init;
@@ -644,15 +644,15 @@ int greth_initialize(bd_t * bis)
 
        /* Make descriptor string */
        if (greth->gbit_mac) {
-               sprintf(dev->name, "GRETH 10/100/GB");
+               sprintf(dev->name, "GRETH_10/100/GB");
        } else {
-               sprintf(dev->name, "GRETH 10/100");
+               sprintf(dev->name, "GRETH_10/100");
        }
 
        /* initiate PHY, select speed/duplex depending on connected PHY */
        if (greth_init_phy(greth, bis)) {
                /* Failed to init PHY (timedout) */
-               debug("GRETH[0x%08x]: Failed to init PHY\n", greth->regs);
+               debug("GRETH[%p]: Failed to init PHY\n", greth->regs);
                return -1;
        }
 
@@ -681,6 +681,6 @@ int greth_initialize(bd_t * bis)
        /* set and remember MAC address */
        greth_set_hwaddr(greth, addr);
 
-       debug("GRETH[0x%08x]: Initialized successfully\n", greth->regs);
+       debug("GRETH[%p]: Initialized successfully\n", greth->regs);
        return 0;
 }