msm: Support DEBUG_LL on MSM Copper
Use new config MSM_HAS_DEBUG_UART_HS instead of SERIAL_MSM_HSL so
as to remove dependency on serial driver to be enabled for DEBUG_LL
functionality.
Update register mappings to support UARTDM core v1.4 in
debug-macro.S and uncompress.h and add IO mappings for
debug uart.
Change-Id: If7a95d568cc4128b229e8f20a398fa63efb34924
Signed-off-by: Sathish Ambley <sambley@codeaurora.org>
diff --git a/arch/arm/mach-msm/include/mach/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h
index 74cbda1..7560dc2 100644
--- a/arch/arm/mach-msm/include/mach/uncompress.h
+++ b/arch/arm/mach-msm/include/mach/uncompress.h
@@ -21,6 +21,7 @@
#include <asm/processor.h>
#include <mach/msm_iomap.h>
+#include <mach/msm_serial_hsl_regs.h>
#ifndef CONFIG_DEBUG_ICEDCC
static void putc(int c)
@@ -28,18 +29,18 @@
#if defined(MSM_DEBUG_UART_PHYS)
unsigned long base = MSM_DEBUG_UART_PHYS;
-#ifdef CONFIG_SERIAL_MSM_HSL
+#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
/*
* Wait for TX_READY to be set; but skip it if we have a
* TX underrun.
*/
- if (__raw_readl(base + 0x08) & 0x08)
- while (!(__raw_readl(base + 0x14) & 0x80))
+ if (!(__raw_readl(base + UARTDM_SR_OFFSET) & 0x08))
+ while (!(__raw_readl(base + UARTDM_ISR_OFFSET) & 0x80))
cpu_relax();
- __raw_writel(0x300, base + 0x10);
- __raw_writel(0x1, base + 0x40);
- __raw_writel(c, base + 0x70);
+ __raw_writel(0x300, base + UARTDM_CR_OFFSET);
+ __raw_writel(0x1, base + UARTDM_NCF_TX_OFFSET);
+ __raw_writel(c, base + UARTDM_TF_OFFSET);
#else
/* Wait for TX_READY to be set */
while (!(__raw_readl(base + 0x08) & 0x04))