>From 7c8394ea8d926cc90c90c76aa48c5cee88f2f149 Mon Sep 17 00:00:00 2001 From: "Ivan T. Ivanov" Date: Wed, 5 Jun 2013 17:35:40 +0300 Subject: [PATCH] msm: Add low-level debugging via MSM 8974 UART Enable low-level debug print routines to direct their output to the serial port on MSM 8974 devices. Signed-off-by: Ivan T. Ivanov --- arch/arm/Kconfig.debug | 8 ++++++++ arch/arm/mach-msm/board-dt-8974.c | 2 ++ arch/arm/mach-msm/include/mach/msm_iomap.h | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 583f4a0..4a8584f 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -323,6 +323,14 @@ choice Say Y here if you want the debug print routines to direct their output to the serial port on MSM 8960 devices. + config DEBUG_MSM8974_UART + bool "Kernel low-level debugging messages via MSM 8974 UART" + depends on ARCH_MSM8974 + select MSM_HAS_DEBUG_UART_HS + help + Say Y here if you want the debug print routines to direct + their output to the serial port on MSM 8974 devices. + config DEBUG_MVEBU_UART bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)" depends on ARCH_MVEBU diff --git a/arch/arm/mach-msm/board-dt-8974.c b/arch/arm/mach-msm/board-dt-8974.c index 697623e..0ce016a 100644 --- a/arch/arm/mach-msm/board-dt-8974.c +++ b/arch/arm/mach-msm/board-dt-8974.c @@ -12,6 +12,7 @@ #include #include +#include static const char * const msm8974_dt_match[] __initconst = { "qcom,msm8974-db", @@ -20,4 +21,5 @@ static const char * const msm8974_dt_match[] __initconst = { DT_MACHINE_START(MSM8974_DT, "Qualcomm MSM (Flattened Device Tree)") .dt_compat = msm8974_dt_match, + .map_io = debug_ll_io_init, MACHINE_END diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index c56e81f..7e08189 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h @@ -59,6 +59,10 @@ #define MSM_DEBUG_UART_BASE 0xE1000000 #define MSM_DEBUG_UART_PHYS MSM_UART3_PHYS #endif +#ifdef CONFIG_DEBUG_MSM8974_UART +#define MSM_DEBUG_UART_BASE 0xfa71e000 +#define MSM_DEBUG_UART_PHYS 0xf991e000 +#endif /* Virtual addresses shared across all MSM targets. */ #define MSM_CSR_BASE IOMEM(0xE0001000) -- 1.7.9.5