From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 26 Mar 2020 14:01:29 +0000 (+0100)
Subject: net: macb: Fix incorrect write function name when MACB_ZYNQ is enabled.
X-Git-Tag: v2020.04-rc5~14^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7f6b0f3357bd25c7ed23f8f5a76a99ab9a0fd398;p=oweals%2Fu-boot.git

net: macb: Fix incorrect write function name when MACB_ZYNQ is enabled.

When MACB_ZYNQ is enabled there is compilation warnings
drivers/net/macb.c: In function ‘_macb_init’:
drivers/net/macb.h:675:33: error: ‘MACB_DMACFG’ undeclared (first use in this function);
 did you mean ‘MACB_MCF’?
  writel((value), (port)->regs + MACB_##reg)
                                 ^~~~~

It has been caused by changing macros name by commit below.

Fixes: 6c636514d499 ("net: macb: sync header definitions as taken from Linux")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

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);