2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index ca34efc62bae..edb2aba9045c 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -108,6 +108,14 @@ void macb_set_hwaddr(struct macb *bp)
        macb_or_gem_writel(bp, SA1B, bottom);
        top = cpu_to_le16(*((u16 *)(bp->dev->dev_addr + 4)));
        macb_or_gem_writel(bp, SA1T, top);
+        /* Clear unused address register sets */
+        macb_or_gem_writel(bp, SA2B, 0);
+        macb_or_gem_writel(bp, SA2T, 0);
+        macb_or_gem_writel(bp, SA3B, 0);
+        macb_or_gem_writel(bp, SA3T, 0);
+        macb_or_gem_writel(bp, SA4B, 0);
+        macb_or_gem_writel(bp, SA4T, 0);
 }
 EXPORT_SYMBOL_GPL(macb_set_hwaddr);
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 864e38042b2d..44144218dd37 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -74,6 +74,12 @@
 #define GEM_HRT                                 0x0084
 #define GEM_SA1B                                0x0088
 #define GEM_SA1T                                0x008C
+#define GEM_SA2B                                0x0090
+#define GEM_SA2T                                0x0094
+#define GEM_SA3B                                0x0098
+#define GEM_SA3T                                0x009C
+#define GEM_SA4B                                0x00A0
+#define GEM_SA4T                                0x00A4
 #define GEM_OTX                                 0x0100
 #define GEM_DCFG1                               0x0280
 #define GEM_DCFG2                               0x0284

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index ca34efc62bae..edb2aba9045c 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c
@@ -108,6 +108,14 @@ void macb_set_hwaddr(struct macb *bp)
108	macb_or_gem_writel(bp, SA1B, bottom);	108	macb_or_gem_writel(bp, SA1B, bottom);
109	top = cpu_to_le16(((u16 )(bp->dev->dev_addr + 4)));	109	top = cpu_to_le16(((u16 )(bp->dev->dev_addr + 4)));
110	macb_or_gem_writel(bp, SA1T, top);	110	macb_or_gem_writel(bp, SA1T, top);
		111
		112	/* Clear unused address register sets */
		113	macb_or_gem_writel(bp, SA2B, 0);
		114	macb_or_gem_writel(bp, SA2T, 0);
		115	macb_or_gem_writel(bp, SA3B, 0);
		116	macb_or_gem_writel(bp, SA3T, 0);
		117	macb_or_gem_writel(bp, SA4B, 0);
		118	macb_or_gem_writel(bp, SA4T, 0);
111	}	119	}
112	EXPORT_SYMBOL_GPL(macb_set_hwaddr);	120	EXPORT_SYMBOL_GPL(macb_set_hwaddr);
113		121


diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 864e38042b2d..44144218dd37 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h
@@ -74,6 +74,12 @@
74	#define GEM_HRT 0x0084	74	#define GEM_HRT 0x0084
75	#define GEM_SA1B 0x0088	75	#define GEM_SA1B 0x0088
76	#define GEM_SA1T 0x008C	76	#define GEM_SA1T 0x008C
		77	#define GEM_SA2B 0x0090
		78	#define GEM_SA2T 0x0094
		79	#define GEM_SA3B 0x0098
		80	#define GEM_SA3T 0x009C
		81	#define GEM_SA4B 0x00A0
		82	#define GEM_SA4T 0x00A4
77	#define GEM_OTX 0x0100	83	#define GEM_OTX 0x0100
78	#define GEM_DCFG1 0x0280	84	#define GEM_DCFG1 0x0280
79	#define GEM_DCFG2 0x0284	85	#define GEM_DCFG2 0x0284