Skip to content

Commit

Permalink
ARM: mmp: implement DEBUG_LL port choice
Browse files Browse the repository at this point in the history
DEBUG_LL port must be choiced in arch-mmp. DEBUG_LL port should be
UART2 in TTC DKB. And it should be UART3 in brownstone.

Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
  • Loading branch information
Haojian Zhuang committed Aug 16, 2012
1 parent 0d7614f commit fa4cd2a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
14 changes: 14 additions & 0 deletions arch/arm/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,20 @@ choice
Say Y here if you want kernel low-level debugging support
on i.MX6Q UART4.

config DEBUG_MMP_UART2
bool "Kernel low-level debugging message via MMP UART2"
depends on ARCH_MMP
help
Say Y here if you want kernel low-level debugging support
on MMP UART2.

config DEBUG_MMP_UART3
bool "Kernel low-level debugging message via MMP UART3"
depends on ARCH_MMP
help
Say Y here if you want kernel low-level debugging support
on MMP UART3.

config DEBUG_MSM_UART1
bool "Kernel low-level debugging messages via MSM UART1"
depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
Expand Down
12 changes: 10 additions & 2 deletions arch/arm/mach-mmp/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fa4cd2a

Please sign in to comment.