diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-20 10:39:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-20 10:39:12 -0700 |
| commit | 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 (patch) | |
| tree | 853b3e3c05f0b9ee1b5df8464db19b7acc57150c /arch/arm/plat-mxc/include/mach/debug-macro.S | |
| parent | eaa36660de7e174498618d69d7277d44a2f24c3d (diff) | |
| parent | 98e77438aed3cd3343cbb86825127b1d9d2bea33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 91fc7cdb5dc9..e4dde91f0231 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S @@ -44,6 +44,14 @@ #define UART_PADDR MX51_UART1_BASE_ADDR #endif +/* iMX50/53 have same addresses, but not iMX51 */ +#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53) +#ifdef UART_PADDR +#error "CONFIG_DEBUG_LL is incompatible with multiple archs" +#endif +#define UART_PADDR MX53_UART1_BASE_ADDR +#endif + #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) .macro addruart, rp, rv |