From patchwork Sat Jul 9 22:51:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 960502 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p69MqDc6030597 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 9 Jul 2011 22:52:39 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QfgNX-0004lG-Oz; Sat, 09 Jul 2011 22:52:03 +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 1QfgNX-0007gc-DO; Sat, 09 Jul 2011 22:52:03 +0000 Received: from oproxy3-pub.bluehost.com ([69.89.21.8]) by canuck.infradead.org with smtp (Exim 4.76 #1 (Red Hat Linux)) id 1QfgNU-0007gL-0v for linux-arm-kernel@lists.infradead.org; Sat, 09 Jul 2011 22:52:01 +0000 Received: (qmail 29323 invoked by uid 0); 9 Jul 2011 22:51:57 -0000 Received: from unknown (HELO box284.bluehost.com) (69.89.31.84) by oproxy3.bluehost.com with SMTP; 9 Jul 2011 22:51:57 -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=TorMqkPx6rK773bjWJps1yxgAd6Q6JGtyhj9hT25/iNFI/vtZnX7i7/EzhkbBOMibzd8I2LGEg75IAveY3BWAwFuW/hIuzktKTO7gO+D+84z8aRCLQ/Kbw9sYfNylDsb; Received: from [70.96.116.236] (helo=localhost) by box284.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1QfgNQ-00028F-Np; Sat, 09 Jul 2011 16:51:56 -0600 Received: from tkisky by localhost with local (Exim 4.71) (envelope-from ) id 1QfgNO-0002Zu-P8; Sat, 09 Jul 2011 15:51:54 -0700 From: Troy Kisky To: amit.kucheria@canonical.com Subject: [PATCH 1/1] ARM: i.MX50/53: debug-macro: fix UART_PADDR Date: Sat, 9 Jul 2011 15:51:53 -0700 Message-Id: <1310251913-9877-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-20110709_185200_303263_6B0CC5AC X-CRM114-Status: UNSURE ( 7.09 ) 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 [69.89.21.8 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 (demeter2.kernel.org [140.211.167.43]); Sat, 09 Jul 2011 22:52:39 +0000 (UTC) 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