diff options
| author | loos <loos@FreeBSD.org> | 2016-09-05 18:42:21 +0000 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-09-05 22:56:33 -0500 |
| commit | ceedb4245fa266a3499913613e49f9ef1321030e (patch) | |
| tree | ddba28e280bb574a8311003c11ca48390d69e1fe | |
| parent | bdd62b08b986ec5c9d2aa314f2ff8f2e98b25779 (diff) | |
| download | FreeBSD-src-ceedb4245fa266a3499913613e49f9ef1321030e.zip FreeBSD-src-ceedb4245fa266a3499913613e49f9ef1321030e.tar.gz | |
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
(cherry picked from commit 14b5b8719443b160af06db265d0d60446eb93fd0)
| -rw-r--r-- | sys/arm/ti/am335x/am335x_scm.h | 2 | ||||
| -rw-r--r-- | sys/arm/ti/cpsw/if_cpsw.c | 9 | ||||
| -rw-r--r-- | sys/arm/ti/cpsw/if_cpswreg.h | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arm/ti/am335x/am335x_scm.h b/sys/arm/ti/am335x/am335x_scm.h index 6426208..6116be0 100644 --- a/sys/arm/ti/am335x/am335x_scm.h +++ b/sys/arm/ti/am335x/am335x_scm.h @@ -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__ */ diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 038d2d2..27f187c 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -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, ®); + 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(CPSW_MAC_ID0_LO + 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; diff --git a/sys/arm/ti/cpsw/if_cpswreg.h b/sys/arm/ti/cpsw/if_cpswreg.h index c6f3e89..bea6f19 100644 --- a/sys/arm/ti/cpsw/if_cpswreg.h +++ b/sys/arm/ti/cpsw/if_cpswreg.h @@ -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) |
