Author: loos
Date: Fri Dec 30 20:18:50 2016
New Revision: 310855
URL: https://svnweb.freebsd.org/changeset/base/310855
Log:
MFC of r305112, r305113, r305119, r305141 and r305432:
Replace magic numbers with the proper register names.
Fix the build, revert r305119, move the control module register data to
am335x_scm.h and fix if_cpsw.c to include the correct header.
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
stable/11/sys/arm/ti/am335x/am335x_prcm.c
stable/11/sys/arm/ti/am335x/am335x_scm.h
stable/11/sys/arm/ti/cpsw/if_cpsw.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/ti/am335x/am335x_prcm.c
==============================================================================
--- stable/11/sys/arm/ti/am335x/am335x_prcm.c Fri Dec 30 20:16:09 2016
(r310854)
+++ stable/11/sys/arm/ti/am335x/am335x_prcm.c Fri Dec 30 20:18:50 2016
(r310855)
@@ -52,6 +52,8 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
+#include "am335x_scm.h"
+
#define CM_PER 0
#define CM_PER_L4LS_CLKSTCTRL (CM_PER + 0x000)
#define CM_PER_L3S_CLKSTCTRL (CM_PER + 0x004)
@@ -619,10 +621,9 @@ am335x_clk_get_sysclk_freq(struct ti_clo
{
uint32_t ctrl_status;
- /* Read the input clock freq from the control module */
- /* control_status reg (0x40) */
- if (ti_scm_reg_read_4(0x40, &ctrl_status))
- return ENXIO;
+ /* Read the input clock freq from the control module. */
+ if (ti_scm_reg_read_4(SCM_CTRL_STATUS, &ctrl_status))
+ return (ENXIO);
switch ((ctrl_status>>22) & 0x3) {
case 0x0:
Modified: stable/11/sys/arm/ti/am335x/am335x_scm.h
==============================================================================
--- stable/11/sys/arm/ti/am335x/am335x_scm.h Fri Dec 30 20:16:09 2016
(r310854)
+++ stable/11/sys/arm/ti/am335x/am335x_scm.h Fri Dec 30 20:18:50 2016
(r310855)
@@ -29,10 +29,13 @@
#define __AM335X_SCM_H__
/* AM335x-specific registers for control module (scm) */
+#define SCM_CTRL_STATUS 0x40
#define SCM_USB_CTRL0 0x620
#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: stable/11/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- stable/11/sys/arm/ti/cpsw/if_cpsw.c Fri Dec 30 20:16:09 2016
(r310854)
+++ stable/11/sys/arm/ti/cpsw/if_cpsw.c Fri Dec 30 20:18:50 2016
(r310855)
@@ -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(0x634 + sc->unit * 8, ®);
+ ti_scm_reg_read_4(SCM_MAC_ID0_HI + sc->unit * 8, ®);
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, ®);
+ ti_scm_reg_read_4(SCM_MAC_ID0_LO + sc->unit * 8, ®);
mac_addr[4] = reg & 0xFF;
mac_addr[5] = (reg >> 8) & 0xFF;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
