From: Georgi Djakov <gdjakov@mm-sol.com>
To: pebolle@tiscali.nl, galak@codeaurora.org, iivanov@mm-sol.com
Cc: 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,
Georgi Djakov <gdjakov@mm-sol.com>
Subject: [PATCH v2] ARM: msm: Update the references to DEBUG_MSM_UARTx
Date: Mon, 26 May 2014 19:37:40 +0300 [thread overview]
Message-ID: <1401122260-12002-1-git-send-email-gdjakov@mm-sol.com> (raw)
In-Reply-To: <1401116287.6068.15.camel@x220>
The Kconfig options DEBUG_MSM_UART1, DEBUG_MSM_UART2, DEBUG_MSM_UART3,
MSM_DEBUG_UART1, MSM_DEBUG_UART2 and MSM_DEBUG_UART3 are removed, but
they are still referenced in the following files:
arch/arm/mach-msm/io.c,
arch/arm/mach-msm/board-trout.c
arch/arm/mach-msm/board-trout-gpio.c
Fix this by updating the reference to the new Kconfig option.
Reported-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
---
Changes since v1:
- Fixed similar issue in board-trout.c and board-trout-gpio.c
Applies to next-20140526.
arch/arm/mach-msm/board-trout-gpio.c | 2 +-
arch/arm/mach-msm/board-trout.c | 2 +-
arch/arm/mach-msm/io.c | 6 ++----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
index 87e1d01..e24930e 100644
--- a/arch/arm/mach-msm/board-trout-gpio.c
+++ b/arch/arm/mach-msm/board-trout-gpio.c
@@ -94,7 +94,7 @@ static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
}
static struct msm_gpio_chip msm_gpio_banks[] = {
-#if defined(CONFIG_MSM_DEBUG_UART1)
+#if defined(CONFIG_DEBUG_MSM_UART) && (CONFIG_DEBUG_UART_PHYS == 0xa9a00000)
/* H2W pins <-> UART1 */
TROUT_GPIO_BANK("MISC2", 0x00, TROUT_GPIO_MISC2_BASE, 0x40),
#else
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 015d544..8369dfd 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -90,7 +90,7 @@ static void __init trout_map_io(void)
msm_map_common_io();
iotable_init(trout_io_desc, ARRAY_SIZE(trout_io_desc));
-#ifdef CONFIG_MSM_DEBUG_UART3
+#if defined(CONFIG_DEBUG_MSM_UART) && (CONFIG_DEBUG_UART_PHYS == 0xa9c00000)
/* route UART3 to the "H2W" extended usb connector */
writeb(0x80, TROUT_CPLD_BASE + 0x00);
#endif
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);
--
1.7.9.5
next prev parent reply other threads:[~2014-05-26 16:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-23 18:42 [GIT PULL] qcom SoC changes for v3.16 Kumar Gala
2014-05-23 20:10 ` Arnd Bergmann
2014-05-26 12:49 ` Paul Bolle
2014-05-26 13:47 ` Georgi Djakov
2014-05-27 6:12 ` Ivan T. Ivanov
2014-05-26 13:48 ` Ivan T. Ivanov
2014-05-26 13:58 ` [PATCH] ARM: msm: Update the references to DEBUG_MSM_UARTx Georgi Djakov
2014-05-26 14:58 ` Paul Bolle
2014-05-26 15:44 ` Georgi Djakov
2014-05-26 16:37 ` Georgi Djakov [this message]
2014-06-19 8:16 ` [PATCH v2] " Paul Bolle
2014-09-04 22:38 ` Paul Bolle
2014-09-05 7:23 ` Georgi Djakov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401122260-12002-1-git-send-email-gdjakov@mm-sol.com \
--to=gdjakov@mm-sol.com \
--cc=agross@codeaurora.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=davidb@codeaurora.org \
--cc=galak@codeaurora.org \
--cc=iivanov@mm-sol.com \
--cc=khilman@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=pebolle@tiscali.nl \
--cc=srinivas.kandagatla@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®