From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm/mxc: add the missing UART_PADDR for i.mx53
Date: Wed, 20 Jul 2011 21:13:19 +0800 [thread overview]
Message-ID: <1311167599-21790-1-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1310251913-9877-1-git-send-email-troy.kisky@boundarydevices.com>
The UART_PADDR definition for i.mx53 and i.mx50 is missing in
debug-macro.S. It causes the build of i.mx53/50 fail.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reported-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
Troy,
Since I'm keen to get the build failure fixed, I just repost
the patch you sent with Sascha's comment fixed. Hope you do
not mind.
arch/arm/plat-mxc/include/mach/debug-macro.S | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
index 91fc7cd..8cf8dee 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -44,6 +44,14 @@
#define UART_PADDR MX51_UART1_BASE_ADDR
#endif
+#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53)
+#ifdef UART_PADDR
+#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
+#endif
+/* i.MX50 gets the same UART1 base address as i.MX53 */
+#define UART_PADDR MX53_UART1_BASE_ADDR
+#endif
+
#define UART_VADDR IMX_IO_ADDRESS(UART_PADDR)
.macro addruart, rp, rv
--
1.7.4.1
next prev parent reply other threads:[~2011-07-20 13:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-09 22:51 [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR Troy Kisky
2011-07-11 9:06 ` Amit Kucheria
2011-07-11 9:30 ` Uwe Kleine-König
2011-07-11 10:08 ` Amit Kucheria
2011-07-11 13:58 ` Uwe Kleine-König
2011-07-12 13:32 ` Sascha Hauer
2011-07-12 17:04 ` Troy Kisky
2011-07-15 7:56 ` Sascha Hauer
2011-07-20 13:13 ` Shawn Guo [this message]
2011-07-20 13:08 ` [PATCH] arm/mxc: add the missing UART_PADDR for i.mx53 Wolfram Sang
2011-07-20 13:24 ` Shawn Guo
2011-07-20 13:27 ` Wolfram Sang
2011-07-20 13:44 ` Shawn Guo
2011-07-20 13:45 ` Wolfram Sang
2011-07-20 13:59 ` Shawn Guo
2011-07-20 20:44 ` Wolfram Sang
2011-07-20 20:13 ` Troy Kisky
2011-07-20 23:13 ` Shawn Guo
2011-07-20 13:40 ` Shawn Guo
2011-07-20 21:10 ` Troy Kisky
2011-07-20 23:16 ` Shawn Guo
2011-07-21 0:31 ` Troy Kisky
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=1311167599-21790-1-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).