projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Drop linux/delay.h from common header
[oweals/u-boot.git]
/
drivers
/
net
/
macb.c
diff --git
a/drivers/net/macb.c
b/drivers/net/macb.c
index 0d4929bec1319783e31859d7e3ed21aa30cf6fd4..424ca59707f2d5549dda2d6998e6cabb1720c5f1 100644
(file)
--- a/
drivers/net/macb.c
+++ b/
drivers/net/macb.c
@@
-6,6
+6,8
@@
#include <clk.h>
#include <cpu_func.h>
#include <dm.h>
#include <clk.h>
#include <cpu_func.h>
#include <dm.h>
+#include <log.h>
+#include <linux/delay.h>
/*
* The u-boot networking stack is a little weird. It seems like the
/*
* The u-boot networking stack is a little weird. It seems like the
@@
-38,7
+40,7
@@
#include <linux/mii.h>
#include <asm/io.h>
#include <linux/mii.h>
#include <asm/io.h>
-#include <
asm
/dma-mapping.h>
+#include <
linux
/dma-mapping.h>
#include <asm/arch/clk.h>
#include <linux/errno.h>
#include <asm/arch/clk.h>
#include <linux/errno.h>
@@
-342,7
+344,7
@@
static int _macb_send(struct macb_device *macb, const char *name, void *packet,
udelay(1);
}
udelay(1);
}
- dma_unmap_single(pa
cket
, length, DMA_TO_DEVICE);
+ dma_unmap_single(pa
ddr
, length, DMA_TO_DEVICE);
if (i <= MACB_TX_TIMEOUT) {
if (ctrl & MACB_BIT(TX_UNDERRUN))
if (i <= MACB_TX_TIMEOUT) {
if (ctrl & MACB_BIT(TX_UNDERRUN))
@@
-807,7
+809,7
@@
static int _macb_init(struct macb_device *macb, const char *name)
macb->next_rx_tail = 0;
#ifdef CONFIG_MACB_ZYNQ
macb->next_rx_tail = 0;
#ifdef CONFIG_MACB_ZYNQ
-
macb
_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT);
+
gem
_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT);
#endif
macb_writel(macb, RBQP, macb->rx_ring_dma);
#endif
macb_writel(macb, RBQP, macb->rx_ring_dma);