Patchwork [1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR

login
register
mail settings
Submitter Troy Kisky
Date July 12, 2011, 2:40 a.m.
Message ID <1310438444-4237-1-git-send-email-troy.kisky@boundarydevices.com>
Download mbox | patch
Permalink /patch/104312/
State New
Headers show

Comments

Troy Kisky - July 12, 2011, 2:40 a.m.
The i.MX51 UART_PADDR value does not work for MX50/53.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
 arch/arm/plat-mxc/include/mach/debug-macro.S |   42 +++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 8 deletions(-)
Uwe Kleine-K├Ânig - July 12, 2011, 7:44 a.m.
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>
> ---
>  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
I'm not sure it's worth the effort to do this. Still you should at least
note it in the change log or better move it to a separate patch.

Best regards
Uwe
Sascha Hauer - July 12, 2011, 1:34 p.m.
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
> 
>
Troy Kisky - July 12, 2011, 4:48 p.m.
On 7/12/2011 6:34 AM, Sascha Hauer wrote:
> 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

I agree, I was trying to address Uwe's complaint.

Troy

Patch

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)