aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/debug-macro.S
diff options
context:
space:
mode:
authorAmit Kucheria <amit.kucheria@canonical.com>2010-02-04 12:09:40 -0800
committerAmit Kucheria <amit.kucheria@canonical.com>2010-02-09 18:32:10 +0200
commit438caa3f6c91ba21c539a8547c4075b619dc6500 (patch)
tree6590ae5c3b5140babd9642572a042695a2c49c82 /arch/arm/plat-mxc/include/mach/debug-macro.S
parentmxc: refactor timer code to use timer versions (diff)
downloadlinux-dev-438caa3f6c91ba21c539a8547c4075b619dc6500.tar.xz
linux-dev-438caa3f6c91ba21c539a8547c4075b619dc6500.zip
mxc: changes to common plat-mxc code to add support for i.MX5
Prepare for i.MX5 SoC code by adding the relevant macros to common plat-mxc code. Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/debug-macro.S')
-rw-r--r--arch/arm/plat-mxc/include/mach/debug-macro.S9
1 files changed, 9 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 916d4fcb2ef2..133d66bfb533 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -45,6 +45,15 @@
#define UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR)
#endif
+#ifdef CONFIG_ARCH_MX5
+#ifdef UART_PADDR
+#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
+#endif
+#include <mach/mx51.h>
+#define UART_PADDR MX51_UART1_BASE_ADDR
+#define UART_VADDR MX51_AIPS1_IO_ADDRESS(MX51_UART1_BASE_ADDR)
+#endif
+
#ifdef CONFIG_ARCH_MXC91231
#ifdef UART_PADDR
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"