* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
@ 2011-07-12 2:40 Troy Kisky
2011-07-12 7:44 ` Uwe Kleine-König
2011-07-12 13:34 ` Sascha Hauer
0 siblings, 2 replies; 12+ messages in thread
From: Troy Kisky @ 2011-07-12 2:40 UTC (permalink / raw)
To: linux-arm-kernel
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
#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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
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
1 sibling, 0 replies; 12+ messages in thread
From: Uwe Kleine-König @ 2011-07-12 7:44 UTC (permalink / raw)
To: linux-arm-kernel
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
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
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
1 sibling, 1 reply; 12+ messages in thread
From: Sascha Hauer @ 2011-07-12 13:34 UTC (permalink / raw)
To: linux-arm-kernel
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 |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
2011-07-12 13:34 ` Sascha Hauer
@ 2011-07-12 16:48 ` Troy Kisky
0 siblings, 0 replies; 12+ messages in thread
From: Troy Kisky @ 2011-07-12 16:48 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
2011-07-12 17:04 ` Troy Kisky
@ 2011-07-15 7:56 ` Sascha Hauer
0 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2011-07-15 7:56 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 12, 2011 at 10:04:39AM -0700, Troy Kisky wrote:
> On 7/12/2011 6:32 AM, Sascha Hauer wrote:
> > 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
> >
> >> ---
>
> From arch/arm/mach-mx5/Kconfig
>
> # ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single
> # image. So for most time, SOC_IMX50/51/53 should be used.
>
>
> So, it would seem to me that the ARCH variant would be correct.
No, we want to get rid of CONFIG_ARCH_MX*. The debug macro stuff is a
bit special as we intentionally disable multi soc kernels for the low
level debug case.
Sascha
--
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 |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
2011-07-12 13:32 ` Sascha Hauer
@ 2011-07-12 17:04 ` Troy Kisky
2011-07-15 7:56 ` Sascha Hauer
0 siblings, 1 reply; 12+ messages in thread
From: Troy Kisky @ 2011-07-12 17:04 UTC (permalink / raw)
To: linux-arm-kernel
On 7/12/2011 6:32 AM, Sascha Hauer wrote:
> 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
>
>> ---
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
2011-07-09 22:51 Troy Kisky
2011-07-11 9:06 ` Amit Kucheria
@ 2011-07-12 13:32 ` Sascha Hauer
2011-07-12 17:04 ` Troy Kisky
1 sibling, 1 reply; 12+ messages in thread
From: Sascha Hauer @ 2011-07-12 13:32 UTC (permalink / raw)
To: linux-arm-kernel
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 |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
2011-07-11 10:08 ` Amit Kucheria
@ 2011-07-11 13:58 ` Uwe Kleine-König
0 siblings, 0 replies; 12+ messages in thread
From: Uwe Kleine-König @ 2011-07-11 13:58 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 11, 2011 at 01:08:38PM +0300, Amit Kucheria wrote:
> On 11 Jul 11, Uwe Kleine-K?nig wrote:
> > 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@boundarydevices.com>
> > >
> > > Acked-by: Amit Kucheria <amit.kucheria@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.
>
> Indeed they're different. But it seems to me that
> arch/arm/mach-omap2/include/mach/debug-macro.S and arch/arm/plat-omap/include/plat/uncompress.h
> show clearly how we can deal with the serial port addresses (for DEBUG_LL)
> dynamically. No?
Looking at arch/arm/mach-omap2/include/mach/debug-macro.S it doesn't
look easy. And considering that debug-macro.S is only needed for early
board bringup, it's totally OK to have hardcoded values for only a
single SOC at a time in it. And I really like to keep this simple as it
is the first working debug mechanism during boot.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
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
0 siblings, 1 reply; 12+ messages in thread
From: Amit Kucheria @ 2011-07-11 10:08 UTC (permalink / raw)
To: linux-arm-kernel
On 11 Jul 11, Uwe Kleine-K?nig wrote:
> 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@boundarydevices.com>
> >
> > Acked-by: Amit Kucheria <amit.kucheria@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.
Indeed they're different. But it seems to me that
arch/arm/mach-omap2/include/mach/debug-macro.S and arch/arm/plat-omap/include/plat/uncompress.h
show clearly how we can deal with the serial port addresses (for DEBUG_LL)
dynamically. No?
> > > ---
> > > 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?
>
--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
2011-07-11 9:06 ` Amit Kucheria
@ 2011-07-11 9:30 ` Uwe Kleine-König
2011-07-11 10:08 ` Amit Kucheria
0 siblings, 1 reply; 12+ messages in thread
From: Uwe Kleine-König @ 2011-07-11 9:30 UTC (permalink / raw)
To: linux-arm-kernel
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@boundarydevices.com>
>
> Acked-by: Amit Kucheria <amit.kucheria@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/ |
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
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-12 13:32 ` Sascha Hauer
1 sibling, 1 reply; 12+ messages in thread
From: Amit Kucheria @ 2011-07-11 9:06 UTC (permalink / raw)
To: linux-arm-kernel
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@boundarydevices.com>
Acked-by: Amit Kucheria <amit.kucheria@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.
> ---
> 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
>
--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR
@ 2011-07-09 22:51 Troy Kisky
2011-07-11 9:06 ` Amit Kucheria
2011-07-12 13:32 ` Sascha Hauer
0 siblings, 2 replies; 12+ messages in thread
From: Troy Kisky @ 2011-07-09 22:51 UTC (permalink / raw)
To: linux-arm-kernel
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 | 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-07-15 7:56 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
-- 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.