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

[Luiz Otavio O Souza]

Author: loos
Date: Mon Sep  5 18:42:21 2016
New Revision: 305432
URL: https://svnweb.freebsd.org/changeset/base/305432

Log:
  Revert r305119, move the control module register data to am335x_scm.h and
  fix if_cpsw.c to include the correct header.
  
  Discussed with:	bz

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	Mon Sep  5 18:05:45 2016	(r305431)
+++ head/sys/arm/ti/am335x/am335x_scm.h	Mon Sep  5 18:42:21 2016	(r305432)
@@ -42,6 +42,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	Mon Sep  5 18:05:45 2016	(r305431)
+++ head/sys/arm/ti/cpsw/if_cpsw.c	Mon Sep  5 18:42:21 2016	(r305432)
@@ -78,6 +78,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <machine/resource.h>
 
+#include <arm/ti/ti_scm.h>
+#include <arm/ti/am335x/am335x_scm.h>
+
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
@@ -87,8 +90,6 @@ __FBSDID("$FreeBSD$");
 
 #include "if_cpswreg.h"
 #include "if_cpswvar.h"
- 
-#include <arm/ti/ti_scm.h>
 
 #include "miibus_if.h"
 
@@ -1019,14 +1020,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(CPSW_MAC_ID0_HI + 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(CPSW_MAC_ID0_LO + 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;
 

Modified: head/sys/arm/ti/cpsw/if_cpswreg.h
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpswreg.h	Mon Sep  5 18:05:45 2016	(r305431)
+++ head/sys/arm/ti/cpsw/if_cpswreg.h	Mon Sep  5 18:42:21 2016	(r305432)
@@ -46,9 +46,6 @@
 #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)