diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-12 22:37:04 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 22:37:04 -0700 |
| commit | 3b164b7b5260b8006a5dee00554d69ad0d79743f (patch) | |
| tree | 05181b34d3cebbd6886dd76ba5d97adc10947ee7 /arch/arm/mach-mmp | |
| parent | f46e374c1ea7fafce70a838f09fbd67de3e4d49f (diff) | |
| parent | ec9b22eebbcf6ff1dfc121ec1e76bbb98a0418b4 (diff) | |
| download | linux-3b164b7b5260b8006a5dee00554d69ad0d79743f.tar.bz2 | |
Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards
* 'board' of git://github.com/hzhuang1/linux:
ARM: mmp: enable debug uart port in defconfig
ARM: mmp: implement DEBUG_LL port choice
Diffstat (limited to 'arch/arm/mach-mmp')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/debug-macro.S | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/include/mach/debug-macro.S b/arch/arm/mach-mmp/include/mach/debug-macro.S index b6f14d203c25..5c3cc29688ab 100644 --- a/arch/arm/mach-mmp/include/mach/debug-macro.S +++ b/arch/arm/mach-mmp/include/mach/debug-macro.S @@ -9,13 +9,21 @@ * published by the Free Software Foundation. */ +#if defined(CONFIG_DEBUG_MMP_UART2) +#define MMP_UART_OFFSET 0x00017000 +#elif defined(CONFIG_DEBUG_MMP_UART3) +#define MMP_UART_OFFSET 0x00018000 +#else +#error "Select uart for DEBUG_LL" +#endif + #include <mach/addr-map.h> .macro addruart, rp, rv, tmp ldr \rp, =APB_PHYS_BASE @ physical ldr \rv, =APB_VIRT_BASE @ virtual - orr \rp, \rp, #0x00017000 - orr \rv, \rv, #0x00017000 + orr \rp, \rp, #MMP_UART_OFFSET + orr \rv, \rv, #MMP_UART_OFFSET .endm #define UART_SHIFT 2 |