From patchwork Sat Jul 9 22:51:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR Date: Sat, 09 Jul 2011 12:51:53 -0000 From: Troy Kisky X-Patchwork-Id: 104037 Message-Id: <1310251913-9877-1-git-send-email-troy.kisky@boundarydevices.com> To: amit.kucheria@canonical.com Cc: s.hauer@pengutronix.de, Troy Kisky , linux-arm-kernel@lists.infradead.org, u.kleine-koenig@pengutronix.de The i.MX51 UART_PADDR value does not work for MX50/53. Signed-off-by: Troy Kisky Acked-by: Amit Kucheria --- 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