From patchwork Wed Apr 9 13:08:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 3955161 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B82C49F371 for ; Wed, 9 Apr 2014 13:10:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA64220453 for ; Wed, 9 Apr 2014 13:10:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBD4520451 for ; Wed, 9 Apr 2014 13:10:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758261AbaDINJi (ORCPT ); Wed, 9 Apr 2014 09:09:38 -0400 Received: from ns.mm-sol.com ([37.157.136.199]:59388 "EHLO extserv.mm-sol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758210AbaDINJg (ORCPT ); Wed, 9 Apr 2014 09:09:36 -0400 Received: from iivanov-dev.wifi.mm-sol.com (unknown [37.157.136.206]) by extserv.mm-sol.com (Postfix) with ESMTPSA id 713B5C76B; Wed, 9 Apr 2014 16:09:34 +0300 (EEST) From: "Ivan T. Ivanov" To: Russell King , David Brown , Daniel Walker Cc: "Ivan T. Ivanov" , Stephen Boyd , Rohit Vaswani , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH] ARM: msm: Make MSM_HAS_DEBUG_UART_HS option visible to multiplatform targets Date: Wed, 9 Apr 2014 16:08:32 +0300 Message-Id: <1397048912-6738-1-git-send-email-iivanov@mm-sol.com> X-Mailer: git-send-email 1.8.3.2 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Ivan T. Ivanov" 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 --- 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(-) -- 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 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