From: "Ivan T. Ivanov" <[email protected]> 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 <[email protected]> --- arch/arm/Kconfig.debug | 5 +---- arch/arm/include/debug/msm.S | 7 +++++-- arch/arm/mach-msm/Kconfig | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4a2fc0bf..a49caf6 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 @@ -1153,7 +1150,7 @@ config DEBUG_UNCOMPRESS When this option is set, the selected DEBUG_LL output method will be re-used for normal decompressor output on multiplatform kernels. - + config UNCOMPRESS_INCLUDE string diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S index 9d653d4..09ff7b7 100644 --- a/arch/arm/include/debug/msm.S +++ b/arch/arm/include/debug/msm.S @@ -39,11 +39,14 @@ #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_HAS_DEBUG_UART_HS #define MSM_DEBUG_UART_BASE 0xF0040000 #define MSM_DEBUG_UART_PHYS 0x16440000 +#define MSM_HAS_DEBUG_UART_HS #endif #ifdef CONFIG_DEBUG_MSM8974_UART @@ -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 -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
