svn commit: r305119 - in head/sys/arm/ti: am335x cpsw

[Bjoern A. Zeeb]

Author: bz
Date: Wed Aug 31 10:45:33 2016
New Revision: 305119
URL: https://svnweb.freebsd.org/changeset/base/305119

Log:
  After r305113, try to properly replace the magic numbers with
  proper #defines for this driver (not using the wrong header).

Modified:
  head/sys/arm/ti/am335x/am335x_scm.h
  head/sys/arm/ti/cpsw/if_cpsw.c
  head/sys/arm/ti/cpsw/if_cpswreg.h

Modified: head/sys/arm/ti/am335x/am335x_scm.h
==============================================================================
--- head/sys/arm/ti/am335x/am335x_scm.h	Wed Aug 31 09:50:02 2016	(r305118)
+++ head/sys/arm/ti/am335x/am335x_scm.h	Wed Aug 31 10:45:33 2016	(r305119)
@@ -42,8 +42,6 @@
 #define	SCM_USB_STS0	0x624
 #define	SCM_USB_CTRL1	0x628
 #define	SCM_USB_STS1	0x62C
-#define	SCM_MAC_ID0_LO	0x630
-#define	SCM_MAC_ID0_HI	0x634
 #define	SCM_PWMSS_CTRL	0x664
 
 #endif /* __AM335X_SCM_H__ */

Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpsw.c	Wed Aug 31 09:50:02 2016	(r305118)
+++ head/sys/arm/ti/cpsw/if_cpsw.c	Wed Aug 31 10:45:33 2016	(r305119)
@@ -1019,14 +1019,14 @@ cpswp_attach(device_t dev)
 	IFQ_SET_READY(&ifp->if_snd);
 
 	/* Get high part of MAC address from control module (mac_id[0|1]_hi) */
-	ti_scm_reg_read_4(SCM_MAC_ID0_HI + sc->unit * 8, &reg);
+	ti_scm_reg_read_4(CPSW_MAC_ID0_HI + sc->unit * 8, &reg);
 	mac_addr[0] = reg & 0xFF;
 	mac_addr[1] = (reg >>  8) & 0xFF;
 	mac_addr[2] = (reg >> 16) & 0xFF;
 	mac_addr[3] = (reg >> 24) & 0xFF;
 
 	/* Get low part of MAC address from control module (mac_id[0|1]_lo) */
-	ti_scm_reg_read_4(SCM_MAC_ID0_LO + sc->unit * 8, &reg);
+	ti_scm_reg_read_4(CPSW_MAC_ID0_LO + sc->unit * 8, &reg);
 	mac_addr[4] = reg & 0xFF;
 	mac_addr[5] = (reg >>  8) & 0xFF;
 

Modified: head/sys/arm/ti/cpsw/if_cpswreg.h
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpswreg.h	Wed Aug 31 09:50:02 2016	(r305118)
+++ head/sys/arm/ti/cpsw/if_cpswreg.h	Wed Aug 31 10:45:33 2016	(r305119)
@@ -46,6 +46,9 @@
 #define	CPSW_PORT_P_SA_LO(p)		(CPSW_PORT_OFFSET + 0x120 + ((p-1) * 0x100))
 #define	CPSW_PORT_P_SA_HI(p)		(CPSW_PORT_OFFSET + 0x124 + ((p-1) * 0x100))
 
+#define	CPSW_MAC_ID0_LO			0x0630
+#define	CPSW_MAC_ID0_HI			0x0634
+
 #define	CPSW_CPDMA_OFFSET		0x0800
 #define	CPSW_CPDMA_TX_CONTROL		(CPSW_CPDMA_OFFSET + 0x04)
 #define	CPSW_CPDMA_TX_TEARDOWN		(CPSW_CPDMA_OFFSET + 0x08)