redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

msm: allow uart to be conditionally disabled

Browse source 
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>
This commit is contained in:
Daniel Walker 2010-08-18 11:00:25 -07:00
parent 4ca06de368
commit 46fe5f29e3
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/mach-msm/Kconfig
View file

@ -11,6 +11,7 @@ config ARCH_MSM7X00A
select MSM_SMD_PKG3 select MSM_SMD_PKG3
select CPU_V6 select CPU_V6
select MSM_PROC_COMM select MSM_PROC_COMM
select HAS_MSM_DEBUG_UART_PHYS
config ARCH_MSM7X30 config ARCH_MSM7X30
bool "MSM7x30" bool "MSM7x30"
@ -21,6 +22,7 @@ config ARCH_MSM7X30
select MSM_REMOTE_SPINLOCK_DEKKERS select MSM_REMOTE_SPINLOCK_DEKKERS
select MSM_GPIOMUX select MSM_GPIOMUX
select MSM_PROC_COMM select MSM_PROC_COMM
select HAS_MSM_DEBUG_UART_PHYS
config ARCH_QSD8X50 config ARCH_QSD8X50
bool "QSD8X50" bool "QSD8X50"
@ -31,6 +33,8 @@ config ARCH_QSD8X50
select MSM_REMOTE_SPINLOCK_LDREX select MSM_REMOTE_SPINLOCK_LDREX
select MSM_GPIOMUX select MSM_GPIOMUX
select MSM_PROC_COMM select MSM_PROC_COMM
select HAS_MSM_DEBUG_UART_PHYS
endchoice endchoice
config MSM_SOC_REV_A config MSM_SOC_REV_A
@ -41,6 +45,9 @@ config ARCH_MSM_ARM11
config ARCH_MSM_SCORPION config ARCH_MSM_SCORPION
bool bool
config HAS_MSM_DEBUG_UART_PHYS
bool
config MSM_VIC config MSM_VIC
bool bool
@ -93,6 +100,7 @@ config MSM_DEBUG_UART
default 2 if MSM_DEBUG_UART2 default 2 if MSM_DEBUG_UART2
default 3 if MSM_DEBUG_UART3 default 3 if MSM_DEBUG_UART3
if HAS_MSM_DEBUG_UART_PHYS
choice choice
prompt "Debug UART" prompt "Debug UART"
@ -110,6 +118,7 @@ choice
config MSM_DEBUG_UART3 config MSM_DEBUG_UART3
bool "UART3" bool "UART3"
endchoice endchoice
endif
config MSM_SMD_PKG3 config MSM_SMD_PKG3
bool bool

2
arch/arm/mach-msm/include/mach/debug-macro.S
View file

@ -19,7 +19,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#ifdef CONFIG_MSM_DEBUG_UART #ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
.macro addruart, rx, tmp .macro addruart, rx, tmp
@ see if the MMU is enabled and select appropriate base address @ see if the MMU is enabled and select appropriate base address
mrc p15, 0, \rx, c1, c0 mrc p15, 0, \rx, c1, c0