From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763AbaEZPop (ORCPT ); Mon, 26 May 2014 11:44:45 -0400 Received: from ns.mm-sol.com ([37.157.136.199]:52641 "EHLO extserv.mm-sol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752492AbaEZPoo (ORCPT ); Mon, 26 May 2014 11:44:44 -0400 Message-ID: <53836175.3020303@mm-sol.com> Date: Mon, 26 May 2014 18:44:53 +0300 From: Georgi Djakov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Paul Bolle CC: galak@codeaurora.org, iivanov@mm-sol.com, arm@kernel.org, khilman@linaro.org, arnd@arndb.de, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, olof@lixom.net, davidb@codeaurora.org, linux-arm-kernel@lists.infradead.org, agross@codeaurora.org, linus.walleij@linaro.org, srinivas.kandagatla@linaro.org Subject: Re: [PATCH] ARM: msm: Update the references to DEBUG_MSM_UARTx References: <1401108595.6068.5.camel@x220> <1401112733-23649-1-git-send-email-gdjakov@mm-sol.com> <1401116287.6068.15.camel@x220> In-Reply-To: <1401116287.6068.15.camel@x220> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/26/2014 05:58 PM, Paul Bolle wrote: > Hi Georgi, Hi Paul, > > On Mon, 2014-05-26 at 16:58 +0300, Georgi Djakov wrote: >> The Kconfig options DEBUG_MSM_UART1, DEBUG_MSM_UART2 and DEBUG_MSM_UART3 >> are removed, but they are still referenced in arch/arm/mach-msm/io.c >> Fix this by updating the reference to the new Kconfig option. >> >> Reported-by: Paul Bolle >> Signed-off-by: Georgi Djakov >> --- >> arch/arm/mach-msm/io.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c >> index 34e0947..b042dca 100644 >> --- a/arch/arm/mach-msm/io.c >> +++ b/arch/arm/mach-msm/io.c >> @@ -57,8 +57,7 @@ static struct map_desc msm_io_desc[] __initdata = { >> .length = MSM_SHARED_RAM_SIZE, >> .type = MT_DEVICE, >> }, >> -#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ >> - defined(CONFIG_DEBUG_MSM_UART3) >> +#if defined(CONFIG_DEBUG_MSM_UART) >> { >> /* Must be last: virtual and pfn filled in by debug_ll_addr() */ >> .length = SZ_4K, >> @@ -76,8 +75,7 @@ void __init msm_map_common_io(void) >> * pages are peripheral interface or not. >> */ >> asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0)); >> -#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ >> - defined(CONFIG_DEBUG_MSM_UART3) >> +#if defined(CONFIG_DEBUG_MSM_UART) >> #ifdef CONFIG_MMU >> debug_ll_addr(&msm_io_desc[size - 1].pfn, >> &msm_io_desc[size - 1].virtual); > > Should I now redo https://lkml.org/lkml/2014/5/15/249 by making the > (outdated) checks in arch/arm/mach-msm/board-trout.c and > arch/arm/mach-msm/board-trout-gpio.c also use CONFIG_DEBUG_MSM_UART? > Hm, not exactly. It seems that this board has multiple UARTs that can be used for debug, so we should also check for the UART PHYS address. I will prepare a patch to fix this too. Thanks, Georgi