msm: Deprecate use of MSM_DEBUG_UART1,2,3 for low level debug
This patch is based off "msm: Consolidate and move DEBUG_LL
to generic ARM Kconfig" where use of MSM_DEBUG_UART1,2,3 is
deprecated and instead have one Kconfig per target/board.
The choice menu for selecting the DEBUG UART still remains
in mach-msm folder and has not been moved under DEBUG_LL
unlike the original patch.
Remove machine_is_*() checks from uncompress.h for various
targets and instead use CONFIG_SERIAL_MSM_HSL to identify
the UART core.
Change-Id: I1de37dfe093213185fb7c759cd731c950a7d0acc
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 c8513b2..74cbda1 100644
--- a/arch/arm/mach-msm/include/mach/uncompress.h
+++ b/arch/arm/mach-msm/include/mach/uncompress.h
@@ -22,33 +22,30 @@
#include <mach/msm_iomap.h>
-bool msm_serial_hsl;
-
#ifndef CONFIG_DEBUG_ICEDCC
static void putc(int c)
{
#if defined(MSM_DEBUG_UART_PHYS)
unsigned long base = MSM_DEBUG_UART_PHYS;
- if (msm_serial_hsl) {
- /*
- * 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))
- cpu_relax();
-
- __raw_writel(0x300, base + 0x10);
- __raw_writel(0x1, base + 0x40);
- __raw_writel(c, base + 0x70);
-
- } else {
- /* Wait for TX_READY to be set */
- while (!(__raw_readl(base + 0x08) & 0x04))
+#ifdef CONFIG_SERIAL_MSM_HSL
+ /*
+ * 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))
cpu_relax();
- __raw_writel(c, base + 0x0c);
- }
+
+ __raw_writel(0x300, base + 0x10);
+ __raw_writel(0x1, base + 0x40);
+ __raw_writel(c, base + 0x70);
+#else
+ /* Wait for TX_READY to be set */
+ while (!(__raw_readl(base + 0x08) & 0x04))
+ cpu_relax();
+ __raw_writel(c, base + 0x0c);
+#endif
#endif
}
#endif
@@ -57,28 +54,8 @@
{
}
-#define DEBUG_LL_HS_ENTRY(machine) \
- if (machine_is_##machine()) { \
- msm_serial_hsl = true; \
- break; \
- }
-
static inline void arch_decomp_setup(void)
{
- do {
- DEBUG_LL_HS_ENTRY(msm8x60_fluid);
- DEBUG_LL_HS_ENTRY(msm8x60_surf);
- DEBUG_LL_HS_ENTRY(msm8x60_ffa);
- DEBUG_LL_HS_ENTRY(msm8x60_fusion);
- DEBUG_LL_HS_ENTRY(msm8x60_fusn_ffa);
- DEBUG_LL_HS_ENTRY(msm8x60_qrdc);
- DEBUG_LL_HS_ENTRY(msm8x60_qt);
- DEBUG_LL_HS_ENTRY(msm8960_cdp);
- DEBUG_LL_HS_ENTRY(msm8960_mtp);
- DEBUG_LL_HS_ENTRY(msm8960_fluid);
- DEBUG_LL_HS_ENTRY(msm8960_apq);
- DEBUG_LL_HS_ENTRY(msm8960_liquid);
- } while (0);
}
static inline void arch_decomp_wdog(void)