From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
Date: Tue, 12 Jul 2011 15:32:31 +0200 [thread overview]
Message-ID: <20110712133231.GQ6069@pengutronix.de> (raw)
In-Reply-To: <1310251913-9877-1-git-send-email-troy.kisky@boundarydevices.com>
Troy,
On Sat, Jul 09, 2011 at 03:51:53PM -0700, Troy Kisky wrote:
> The i.MX51 UART_PADDR value does not work for MX50/53.
>
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Please rebase the patch on my for-next branch and use CONFIG_SOC_IMX*
instead of CONFIG_ARCH_*.
Sascha
> ---
> arch/arm/plat-mxc/include/mach/debug-macro.S | 9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
> index 8e8d175..3919ad4 100644
> --- a/arch/arm/plat-mxc/include/mach/debug-macro.S
> +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
> @@ -37,13 +37,20 @@
> #define UART_PADDR MX3x_UART1_BASE_ADDR
> #endif
>
> -#ifdef CONFIG_ARCH_MX5
> +#ifdef CONFIG_ARCH_MX51
> #ifdef UART_PADDR
> #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> #endif
> #define UART_PADDR MX51_UART1_BASE_ADDR
> #endif
>
> +#if defined(CONFIG_ARCH_MX50) || defined(CONFIG_ARCH_MX53)
> +#ifdef UART_PADDR
> +#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> +#endif
> +#define UART_PADDR MX53_UART1_BASE_ADDR
> +#endif
> +
> #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR)
>
> .macro addruart, rp, rv
> --
> 1.7.0.4
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2011-07-12 13:32 UTC|newest]
Thread overview: 26+ 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 [this message]
2011-07-12 17:04 ` Troy Kisky
2011-07-15 7:56 ` Sascha Hauer
2011-07-20 13:13 ` [PATCH] arm/mxc: add the missing UART_PADDR for i.mx53 Shawn Guo
2011-07-20 13:08 ` 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
-- strict thread matches above, loose matches on Subject: below --
2011-07-12 2:40 [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR Troy Kisky
2011-07-12 7:44 ` Uwe Kleine-König
2011-07-12 13:34 ` Sascha Hauer
2011-07-12 16:48 ` 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=20110712133231.GQ6069@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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).