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

[Luiz Otavio O Souza]

Author: loos
Date: Wed Aug 31 07:03:06 2016
New Revision: 305113
URL: https://svnweb.freebsd.org/changeset/base/305113

Log:
  Replace more magic numbers with the proper register names.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

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

Modified: head/sys/arm/ti/am335x/am335x_scm.h
==============================================================================
--- head/sys/arm/ti/am335x/am335x_scm.h	Wed Aug 31 06:46:47 2016	(r305112)
+++ head/sys/arm/ti/am335x/am335x_scm.h	Wed Aug 31 07:03:06 2016	(r305113)
@@ -34,6 +34,8 @@
 #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 06:46:47 2016	(r305112)
+++ head/sys/arm/ti/cpsw/if_cpsw.c	Wed Aug 31 07:03:06 2016	(r305113)
@@ -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(0x634 + sc->unit * 8, &reg);
+	ti_scm_reg_read_4(SCM_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(0x630 + sc->unit * 8, &reg);
+	ti_scm_reg_read_4(SCM_MAC_ID0_LO + sc->unit * 8, &reg);
 	mac_addr[4] = reg & 0xFF;
 	mac_addr[5] = (reg >>  8) & 0xFF;