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:34:43 +0200 [thread overview]
Message-ID: <20110712133443.GR6069@pengutronix.de> (raw)
In-Reply-To: <1310438444-4237-1-git-send-email-troy.kisky@boundarydevices.com>
On Mon, Jul 11, 2011 at 07:40:44PM -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>
Your first patch looked better...
Sascha
> ---
> arch/arm/plat-mxc/include/mach/debug-macro.S | 42 +++++++++++++++++++++-----
> 1 files changed, 34 insertions(+), 8 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..6b696cd 100644
> --- a/arch/arm/plat-mxc/include/mach/debug-macro.S
> +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
> @@ -17,32 +17,58 @@
> #endif
>
> #ifdef CONFIG_ARCH_MX25
> -#ifdef UART_PADDR
> +#ifndef UART_PADDR
> +#define UART_PADDR MX25_UART1_BASE_ADDR
> +#endif
> +#if UART_PADDR != MX25_UART1_BASE_ADDR
> #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> #endif
> -#define UART_PADDR MX25_UART1_BASE_ADDR
> #endif
>
> #ifdef CONFIG_ARCH_MX2
> -#ifdef UART_PADDR
> +#ifndef UART_PADDR
> +#define UART_PADDR MX2x_UART1_BASE_ADDR
> +#endif
> +#if UART_PADDR != MX2x_UART1_BASE_ADDR
> #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> #endif
> -#define UART_PADDR MX2x_UART1_BASE_ADDR
> #endif
>
> #ifdef CONFIG_ARCH_MX3
> -#ifdef UART_PADDR
> +#ifndef UART_PADDR
> +#define UART_PADDR MX3x_UART1_BASE_ADDR
> +#endif
> +#if UART_PADDR != MX3x_UART1_BASE_ADDR
> #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> #endif
> -#define UART_PADDR MX3x_UART1_BASE_ADDR
> #endif
>
> -#ifdef CONFIG_ARCH_MX5
> -#ifdef UART_PADDR
> +#ifdef CONFIG_ARCH_MX50
> +#ifndef UART_PADDR
> +#define UART_PADDR MX50_UART1_BASE_ADDR
> +#endif
> +#if UART_PADDR != MX50_UART1_BASE_ADDR
> #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> #endif
> +#endif
> +
> +#ifdef CONFIG_ARCH_MX51
> +#ifndef UART_PADDR
> #define UART_PADDR MX51_UART1_BASE_ADDR
> #endif
> +#if UART_PADDR != MX51_UART1_BASE_ADDR
> +#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> +#endif
> +#endif
> +
> +#ifdef CONFIG_ARCH_MX53
> +#ifndef UART_PADDR
> +#define UART_PADDR MX53_UART1_BASE_ADDR
> +#endif
> +#if UART_PADDR != MX53_UART1_BASE_ADDR
> +#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
> +#endif
> +#endif
>
> #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR)
>
> --
> 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:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2011-07-12 16:48 ` Troy Kisky
-- strict thread matches above, loose matches on Subject: below --
2011-07-09 22:51 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
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=20110712133443.GR6069@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).