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

[Uwe Kleine-König]

On Mon, Jul 11, 2011 at 12:06:09PM +0300, Amit Kucheria wrote:
> On 11 Jul 09, Troy Kisky wrote:
> > The i.MX51 UART_PADDR value does not work for MX50/53.
> > 
> > Signed-off-by: Troy Kisky <troy.kisky at boundarydevices.com>
> 
> Acked-by: Amit Kucheria <amit.kucheria at canonical.com>
> 
> but I think we should switch to runtime detection of the machine (machine
> ID?) and then set the port address.
> 
> See arch/arm/plat-omap/include/plat/uncompress.h for a possible scheme.
mach/debug-macro.S and mach/uncompress.h are two different things. And
the uncompress stuff is dynamic for mxc AFAIK.

> > ---
> >  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
> > +
Hm, even though it's obvious, maybe add a comment that
MX50_UART1_BASE_ADDR is identical to MX53_UART1_BASE_ADDR?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |