diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-23 11:03:50 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-23 11:03:50 +0000 |
commit | 27abc2e19ff6234a0b2ff98b3398dbec127314fb (patch) | |
tree | fb7ea3a693458bf480b776c90cf368bc470093c6 /target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include | |
parent | a699bb193aa614906df17173128c33123de8b4c2 (diff) |
[mcs814x] provide an early ioremap cookie of the system configuration register
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32489 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include')
3 files changed, 12 insertions, 13 deletions
diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S index 5c6d373ae..93ecea4ed 100644 --- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S +++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S @@ -1,10 +1,10 @@ #include <mach/mcs814x.h> .macro addruart, rp, rv, tmp - ldr \rp, =_PHYS_CONFADDR - ldr \rv, =_VIRT_CONFADDR - orr \rp, \rp, #_CONFOFFSET_UART - orr \rv, \rv, #_CONFOFFSET_UART + ldr \rp, =MCS814X_PHYS_BASE + ldr \rv, =MCS814X_VIRT_BASE + orr \rp, \rp, #MCS814X_UART + orr \rv, \rv, #MCS814X_UART .endm #define UART_SHIFT 2 diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h index 9dd09d0a4..2851ba49d 100644 --- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h +++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h @@ -20,15 +20,13 @@ #define MCS814X_IRQ_MASK 0x20 #define MCS814X_IRQ_STS0 0x40 -#define _PHYS_CONFADDR 0x40000000 -#define _VIRT_CONFADDR MCS814X_IO_BASE +#define MCS814X_PHYS_BASE 0x40000000 +#define MCS814X_VIRT_BASE MCS814X_IO_BASE -#define _CONFOFFSET_UART 0x000DC000 -#define _CONFOFFSET_DBGLED 0x000EC000 -#define _CONFOFFSET_SYSDBG 0x000F8000 - -#define _CONFADDR_DBGLED (_VIRT_CONFADDR + _CONFOFFSET_DBGLED) -#define _CONFADDR_SYSDBG (_VIRT_CONFADDR + _CONFOFFSET_SYSDBG) +#define MCS814X_UART 0x000DC000 +#define MCS814X_DBGLED 0x000EC000 +#define MCS814X_SYSDBG 0x000F8000 +#define MCS814X_SYSDBG_SIZE 0x50 /* System configuration and bootstrap registers */ #define SYSDBG_BS1 0x00 @@ -46,6 +44,7 @@ #define SYSDBG_SYSCTL 0x08 #define SYSCTL_EMAC (1 << 0) +#define SYSCTL_EPHY (1 << 1) /* active low */ #define SYSCTL_CIPHER (1 << 16) #define SYSDBG_PLL_CTL 0x3C diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h index 2362e3c95..cf3ed9a1a 100644 --- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h +++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h @@ -32,7 +32,7 @@ static inline void flush(void) static inline void arch_decomp_setup(void) { if (soc_is_mcs8140()) - uart_base = (void __iomem *)(_PHYS_CONFADDR + _CONFOFFSET_UART); + uart_base = (void __iomem *)(MCS814X_PHYS_BASE +MCS814X_UART); } #define arch_decomp_wdog() |