From patchwork Tue Jul 12 02:40:44 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: Mon, 11 Jul 2011 16:40:44 -0000 From: Troy Kisky X-Patchwork-Id: 104312 Message-Id: <1310438444-4237-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 --- 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)