ARM: 7860/1: debug: msm: Add DEBUG_LL support for ARCH_MSM8974

Add debug uart support for MSM8974. This patch adds a Kconfig
entry and the base address for the debug uart.

Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 14 insertions, 0 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 8e9665d5fed3..a8f305b07f29 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -357,6 +357,15 @@ 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
+                select DEBUG_MSM_UART
+                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/include/debug/msm.S b/arch/arm/include/debug/msm.S
index 9166e1bc470e..9d653d475903 100644
--- a/arch/arm/include/debug/msm.S
+++ b/arch/arm/include/debug/msm.S
@@ -46,6 +46,11 @@
 #define MSM_DEBUG_UART_PHYS     0x16440000
 #endif
 
+#ifdef CONFIG_DEBUG_MSM8974_UART
+#define MSM_DEBUG_UART_BASE     0xFA71E000
+#define MSM_DEBUG_UART_PHYS     0xF991E000
+#endif
+
         .macro  addruart, rp, rv, tmp
 #ifdef MSM_DEBUG_UART_PHYS
         ldr     \rp, =MSM_DEBUG_UART_PHYS