From patchwork Tue Jul 12 02:40:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 967082 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6C2fFCt024996 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2011 02:41:36 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QgSu7-0004eR-Ny; Tue, 12 Jul 2011 02:40:55 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QgSu7-0007El-B1; Tue, 12 Jul 2011 02:40:55 +0000 Received: from oproxy5-pub.bluehost.com ([67.222.38.55]) by canuck.infradead.org with smtp (Exim 4.76 #1 (Red Hat Linux)) id 1QgSu4-0007EU-Gt for linux-arm-kernel@lists.infradead.org; Tue, 12 Jul 2011 02:40:53 +0000 Received: (qmail 21312 invoked by uid 0); 12 Jul 2011 02:40:50 -0000 Received: from unknown (HELO box284.bluehost.com) (69.89.31.84) by cpoproxy2.bluehost.com with SMTP; 12 Jul 2011 02:40:49 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=boundarydevices.com; h=From:To:Cc:Subject:Date:Message-Id:X-Mailer:X-Identified-User; b=NRNK4xO2N91gzTDB9aehu4BESk4c8/2J8wRKjO315jiBFvfQ7VfH/JESOUTNPjYOlmKY7VXb3m+rPDQ6UgfMrATUzrrFuTkCurQT6xt7h1jTydHxGx69si1tdhRQe2um; Received: from [70.96.116.236] (helo=localhost) by box284.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1QgSu0-0006ZK-Q4; Mon, 11 Jul 2011 20:40:49 -0600 Received: from tkisky by localhost with local (Exim 4.71) (envelope-from ) id 1QgStx-00016v-Ma; Mon, 11 Jul 2011 19:40:45 -0700 From: Troy Kisky To: amit.kucheria@canonical.com Subject: [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR Date: Mon, 11 Jul 2011 19:40:44 -0700 Message-Id: <1310438444-4237-1-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.7.0.4 X-Identified-User: {1412:box284.bluehost.com:boundar4:boundarydevices.com} {sentby:smtp auth 70.96.116.236 authed with troy.kisky@boundarydevices.com} X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110711_224052_759130_611B6F96 X-CRM114-Status: UNSURE ( 7.19 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [67.222.38.55 listed in list.dnswl.org] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Cc: s.hauer@pengutronix.de, Troy Kisky , linux-arm-kernel@lists.infradead.org, u.kleine-koenig@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 12 Jul 2011 02:41:36 +0000 (UTC) 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)