diff mbox

[v2] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets

Message ID 1397053585-26201-1-git-send-email-iivanov@mm-sol.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Ivan T. Ivanov April 9, 2014, 2:26 p.m. UTC 
From: "Ivan T. Ivanov" <iivanov@mm-sol.com>

High Speed UART is available also in new multiplatform QCOM targets.

This fixes:

scripts/kconfig/conf --silentoldconfig Kconfig
warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM)
warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM)

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
---
 arch/arm/Kconfig.debug       | 3 ---
 arch/arm/include/debug/msm.S | 7 +++++--
 arch/arm/mach-msm/Kconfig    | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

--
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Stephen Boyd April 9, 2014, 5:44 p.m. UTC | #1 
On 04/09/14 07:26, Ivan T. Ivanov wrote:
> From: "Ivan T. Ivanov" <iivanov@mm-sol.com>
>
> High Speed UART is available also in new multiplatform QCOM targets.
>
> This fixes:
>
> scripts/kconfig/conf --silentoldconfig Kconfig
> warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM)
> warning: (DEBUG_MSM8660_UART && DEBUG_MSM8960_UART && DEBUG_MSM8974_UART) selects MSM_HAS_DEBUG_UART_HS which has unmet direct dependencies (ARCH_MSM)
>
> Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>

It might be better to move the config out of mach-msm into
arch/arm/Kconfig.debug. I think the eventual goal is to remove all these
#defines for the physical/virtual address and have users enter the
addresses in Kconfig similar to how Russell has done for the pl01X. If
that happens then we end up with a DEBUG_MSM_UART (for 7201,8x50, 7x30)
and DEBUG_QCOM_UARTDM for all others and the help text would indicate
which addresses to use.
diff mbox

Patch

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 4a2fc0bf..320a335 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -376,7 +376,6 @@  choice
 	config DEBUG_MSM8660_UART
 		bool "Kernel low-level debugging messages via MSM 8660 UART"
 		depends on ARCH_MSM8X60
-		select MSM_HAS_DEBUG_UART_HS
 		select DEBUG_MSM_UART
 		help
 		  Say Y here if you want the debug print routines to direct
@@ -385,7 +384,6 @@  choice
 	config DEBUG_MSM8960_UART
 		bool "Kernel low-level debugging messages via MSM 8960 UART"
 		depends on ARCH_MSM8960
-		select MSM_HAS_DEBUG_UART_HS
 		select DEBUG_MSM_UART
 		help
 		  Say Y here if you want the debug print routines to direct
@@ -394,7 +392,6 @@  choice
 	config DEBUG_MSM8974_UART
 		bool "Kernel low-level debugging messages via MSM 8974 UART"
 		depends on ARCH_MSM8974
-		select MSM_HAS_DEBUG_UART_HS
 		select DEBUG_MSM_UART
 		help
 		  Say Y here if you want the debug print routines to direct
diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S
index 9d653d4..0ba84e6 100644
--- a/arch/arm/include/debug/msm.S
+++ b/arch/arm/include/debug/msm.S
@@ -39,16 +39,19 @@ 
 #ifdef CONFIG_DEBUG_MSM8660_UART
 #define MSM_DEBUG_UART_BASE	0xF0040000
 #define MSM_DEBUG_UART_PHYS	0x19C40000
+#define MSM_HAS_DEBUG_UART_HS
 #endif

 #ifdef CONFIG_DEBUG_MSM8960_UART
 #define MSM_DEBUG_UART_BASE	0xF0040000
 #define MSM_DEBUG_UART_PHYS	0x16440000
+#define MSM_HAS_DEBUG_UART_HS
 #endif

 #ifdef CONFIG_DEBUG_MSM8974_UART
 #define MSM_DEBUG_UART_BASE	0xFA71E000
 #define MSM_DEBUG_UART_PHYS	0xF991E000
+#define MSM_HAS_DEBUG_UART_HS
 #endif

 	.macro	addruart, rp, rv, tmp
@@ -59,7 +62,7 @@ 
 	.endm

 	.macro	senduart, rd, rx
-#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
+#ifdef MSM_HAS_DEBUG_UART_HS
 	@ Write the 1 character to UARTDM_TF
 	str	\rd, [\rx, #0x70]
 #else
@@ -68,7 +71,7 @@ 
 	.endm

 	.macro	waituart, rd, rx
-#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
+#ifdef MSM_HAS_DEBUG_UART_HS
 	@ check for TX_EMT in UARTDM_SR
 	ldr	\rd, [\rx, #0x08]
 	tst	\rd, #0x08
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index a7f959e..9b26976 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -42,9 +42,6 @@  config ARCH_QSD8X50

 endchoice

-config MSM_HAS_DEBUG_UART_HS
-	bool
-
 config MSM_SOC_REV_A
 	bool