msm: msm_iomap: Fix DEBUG_UART for 7x27a/7x30
We have moved to unification of IO address map for 7x27a/7x30 with 8k.
This now means that the header files(msm_iomap-7x30.h and
msm_iomap-7xxx.h) will included whichever target gets compiled,
so now we cannot keep the macro MSM_DEBUG_UART_PHYS in both the
files which has different physical address.
Thus moving to CONFIG_MSM_DEBUG_UART_PHYS which gets selected
from Kconfig based on the target selected.
Change-Id: I024e685d7ce2f5df0db49c482cd5d8541884e054
Signed-off-by: Taniya Das <tdas@codeaurora.org>
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index ed2b9ad..023d289 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -874,27 +874,38 @@
Say Y here if you want the debug print routines to direct
their output to the serial port on MSM 8930 devices.
+config MSM_DEBUG_UART_PHYS
+ hex
+ default 0xA9A00000 if (ARCH_MSM7X27 || ARCH_QSD8X50) && DEBUG_MSM_UART1
+ default 0xACA00000 if ARCH_MSM7X30 && DEBUG_MSM_UART1
+ default 0x94000000 if ARCH_FSM9XXX && DEBUG_MSM_UART1
+ default 0xA9B00000 if (ARCH_MSM7X27 || ARCH_QSD8X50) && DEBUG_MSM_UART2
+ default 0xACB00000 if ARCH_MSM7X30 && DEBUG_MSM_UART2
+ default 0x94100000 if ARCH_FSM9XXX && DEBUG_MSM_UART2
+ default 0xA9C00000 if (ARCH_MSM7X27 || ARCH_QSD8X50) && DEBUG_MSM_UART3
+ default 0xACC00000 if ARCH_MSM7X30 && DEBUG_MSM_UART3
+
choice
prompt "Debug UART"
depends on DEBUG_LL
config DEBUG_MSM_UART1
bool "Kernel low-level debugging messages via MSM UART1"
- depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+ depends on ARCH_MSM7X27 || ARCH_MSM7X30 || ARCH_QSD8X50 || ARCH_FSM9XXX
help
Say Y here if you want the debug print routines to direct
their output to the first serial port on MSM devices.
config DEBUG_MSM_UART2
bool "Kernel low-level debugging messages via MSM UART2"
- depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+ depends on ARCH_MSM7X27 || ARCH_MSM7X30 || ARCH_QSD8X50 || ARCH_FSM9XXX
help
Say Y here if you want the debug print routines to direct
their output to the second serial port on MSM devices.
config DEBUG_MSM_UART3
bool "Kernel low-level debugging messages via MSM UART3"
- depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+ depends on ARCH_MSM7X27 || ARCH_MSM7X30 || ARCH_QSD8X50
help
Say Y here if you want the debug print routines to direct
their output to the third serial port on MSM devices.