diff options
| author | loos <loos@FreeBSD.org> | 2017-05-17 15:13:01 +0000 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-09-06 11:32:51 -0500 |
| commit | 917194da6aa937ddfcf03ab9a6a8c09d578be5db (patch) | |
| tree | bd025f4835751e4ce2bd390e26ba2f568de2a14e /sys/arm | |
| parent | 860ada0113116f7e88614073c58b503e11a15b3c (diff) | |
| download | FreeBSD-src-917194da6aa937ddfcf03ab9a6a8c09d578be5db.zip FreeBSD-src-917194da6aa937ddfcf03ab9a6a8c09d578be5db.tar.gz | |
Move the IO Window Control Register defines out of the ARMADA38X ifdef.
Fixes the build of Marvell kernels (other than ARMADA38X) after r318336.
Reported by: mmel
(cherry picked from commit 3ed60ab87519141541888838ef7a341a794b4c6a)
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/mv/mvwin.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/arm/mv/mvwin.h b/sys/arm/mv/mvwin.h index 2eaf655..e84c3a7 100644 --- a/sys/arm/mv/mvwin.h +++ b/sys/arm/mv/mvwin.h @@ -344,18 +344,6 @@ #define MV_BOOTROM_WIN_SIZE 0xF #define MV_CPU_SUBSYS_REGS_LEN 0x100 -/* IO Window Control Register fields */ -#define IO_WIN_SIZE_SHIFT 16 -#define IO_WIN_SIZE_MASK 0xFFFF -#define IO_WIN_ATTR_SHIFT 8 -#define IO_WIN_ATTR_MASK 0xFF -#define IO_WIN_TGT_SHIFT 4 -#define IO_WIN_TGT_MASK 0xF -#define IO_WIN_SYNC_SHIFT 1 -#define IO_WIN_SYNC_MASK 0x1 -#define IO_WIN_ENA_SHIFT 0 -#define IO_WIN_ENA_MASK 0x1 - #define IO_WIN_9_CTRL_OFFSET 0x98 #define IO_WIN_9_BASE_OFFSET 0x9C @@ -368,6 +356,18 @@ #define MV_SYNC_BARRIER_CTRL_ALL 0xFFFF #endif +/* IO Window Control Register fields */ +#define IO_WIN_SIZE_SHIFT 16 +#define IO_WIN_SIZE_MASK 0xFFFF +#define IO_WIN_ATTR_SHIFT 8 +#define IO_WIN_ATTR_MASK 0xFF +#define IO_WIN_TGT_SHIFT 4 +#define IO_WIN_TGT_MASK 0xF +#define IO_WIN_SYNC_SHIFT 1 +#define IO_WIN_SYNC_MASK 0x1 +#define IO_WIN_ENA_SHIFT 0 +#define IO_WIN_ENA_MASK 0x1 + #define WIN_REG_IDX_RD(pre,reg,off,base) \ static __inline uint32_t \ pre ## _ ## reg ## _read(int i) \ |
