diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
commit | 59aaade72544ad1be4183c1066c20b5883a78717 (patch) | |
tree | da57c3029145c21b5eae457fbd66b997b503f155 /arch/arm/plat-omap/include/mach/debug-macro.S | |
parent | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (diff) | |
parent | 99b3075b9095c23acf8d884bdc7fe33c8c3520f0 (diff) |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/plat-omap/include/mach/debug-macro.S')
-rw-r--r-- | arch/arm/plat-omap/include/mach/debug-macro.S | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/debug-macro.S b/arch/arm/plat-omap/include/mach/debug-macro.S index 1b0039bdeb4..1b11f5c6a2d 100644 --- a/arch/arm/plat-omap/include/mach/debug-macro.S +++ b/arch/arm/plat-omap/include/mach/debug-macro.S @@ -35,6 +35,18 @@ #ifdef CONFIG_OMAP_LL_DEBUG_UART3 add \rx, \rx, #0x00004000 @ UART 3 #endif + +#elif CONFIG_ARCH_OMAP3 + moveq \rx, #0x48000000 @ physical base address + movne \rx, #0xd8000000 @ virtual base + orr \rx, \rx, #0x0006a000 +#ifdef CONFIG_OMAP_LL_DEBUG_UART2 + add \rx, \rx, #0x00002000 @ UART 2 +#endif +#ifdef CONFIG_OMAP_LL_DEBUG_UART3 + add \rx, \rx, #0x00fb0000 @ UART 3 + add \rx, \rx, #0x00006000 +#endif #endif .endm |