diff options
author | Tom Rini <trini@konsulko.com> | 2020-03-31 10:07:01 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-03-31 10:07:01 -0400 |
commit | 150db4264d210f6fd4fbf5e0e9cafc135eb13c17 (patch) | |
tree | 34ab1f6c9c0eb1878ab3a2d824d47f7a73ef4ea9 /drivers/net/macb.c | |
parent | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (diff) | |
parent | 7f6b0f3357bd25c7ed23f8f5a76a99ab9a0fd398 (diff) |
Merge branch '2020-03-31-master-imports'
- mpc8xxx GPIO, SPI bugfixes
- Add VxWorks to FIT images
- macb ethernet driver bugfix
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r-- | drivers/net/macb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 631b53b093..bd588cab06 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -807,7 +807,7 @@ static int _macb_init(struct macb_device *macb, const char *name) 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); |