msm: allow uart to be conditionally disabled

Some MSM targets don't select the debug UART in this way. For those we
need to disable this selection mechanism.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index bb3a68bbc1e079547364bb7fddf96ab0ea820863..d658e5fb59cf2bdcce36f5b9df2c44c2a0ceeeeb 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -11,6 +11,7 @@ config ARCH_MSM7X00A
        select MSM_SMD_PKG3
        select CPU_V6
        select MSM_PROC_COMM
+       select HAS_MSM_DEBUG_UART_PHYS
 
 config ARCH_MSM7X30
        bool "MSM7x30"
@@ -21,6 +22,7 @@ config ARCH_MSM7X30
        select MSM_REMOTE_SPINLOCK_DEKKERS
        select MSM_GPIOMUX
        select MSM_PROC_COMM
+       select HAS_MSM_DEBUG_UART_PHYS
 
 config ARCH_QSD8X50
        bool "QSD8X50"
@@ -31,6 +33,8 @@ config ARCH_QSD8X50
        select MSM_REMOTE_SPINLOCK_LDREX
        select MSM_GPIOMUX
        select MSM_PROC_COMM
+       select HAS_MSM_DEBUG_UART_PHYS
+
 endchoice
 
 config MSM_SOC_REV_A
@@ -41,6 +45,9 @@ config  ARCH_MSM_ARM11
 config  ARCH_MSM_SCORPION
        bool
 
+config HAS_MSM_DEBUG_UART_PHYS
+       bool
+
 config  MSM_VIC
        bool
 
@@ -93,6 +100,7 @@ config MSM_DEBUG_UART
        default 2 if MSM_DEBUG_UART2
        default 3 if MSM_DEBUG_UART3
 
+if HAS_MSM_DEBUG_UART_PHYS
 choice
        prompt "Debug UART"
 
@@ -110,6 +118,7 @@ choice
        config MSM_DEBUG_UART3
                bool "UART3"
 endchoice
+endif
 
 config MSM_SMD_PKG3
        bool

diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index 528750f307e9428433c97101153be1933d495ba8..238c4f132cdb954d451addcb00e904cfd6131805 100644 (file)
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -19,7 +19,7 @@
 #include <mach/hardware.h>
 #include <mach/msm_iomap.h>
 
-#ifdef CONFIG_MSM_DEBUG_UART
+#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
        .macro  addruart, rx, tmp
        @ see if the MMU is enabled and select appropriate base address
        mrc     p15, 0, \rx, c1, c0