From patchwork Mon Sep 5 09:46:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 1124752 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 p859l3oU011246 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 5 Sep 2011 09:47:24 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R0Vkv-0002JO-1K; Mon, 05 Sep 2011 09:46:17 +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 1R0Vku-00018B-Ll; Mon, 05 Sep 2011 09:46:16 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R0Vks-00017u-6X for linux-arm-kernel@lists.infradead.org; Mon, 05 Sep 2011 09:46:14 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1R0Vkq-000P70-Ns; Mon, 05 Sep 2011 09:46:12 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19AdLB2VgYIagubbz/lUy94 Date: Mon, 5 Sep 2011 02:46:11 -0700 From: Tony Lindgren To: Nicolas Pitre Subject: [PATCH 2.5/6] ARM: omap: prepare debug-macro.S for offset based calculation of omap_uart_phys and virt Message-ID: <20110905094611.GB1903@atomide.com> References: <1314932353-24813-1-git-send-email-nico@fluxnic.net> <1314932353-24813-3-git-send-email-nico@fluxnic.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1314932353-24813-3-git-send-email-nico@fluxnic.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110905_054614_289187_C525267C X-CRM114-Status: UNSURE ( 8.16 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: linux-arm-kernel@lists.infradead.org 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: , 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]); Mon, 05 Sep 2011 09:47:24 +0000 (UTC) Just change 99 to 100 to allow using 99 for omap_uart_phys in the following patches. Signed-off-by: Tony Lindgren --- a/arch/arm/mach-omap1/include/mach/debug-macro.S +++ b/arch/arm/mach-omap1/include/mach/debug-macro.S @@ -43,7 +43,7 @@ omap_uart_virt: .word 0x0 ldr \rv, [\rv, #0] cmp \rp, #0 @ is port configured? cmpne \rv, #0 - bne 99f @ already configured + bne 100f @ already configured /* Check the debug UART configuration set in uncompress.h */ and \rp, pc, #0xff000000 @@ -82,7 +82,7 @@ omap_uart_virt: .word 0x0 add \rv, \rv, #4 @ omap_uart_lsr str \rp, [\rv, #0] b 9b -99: +100: .endm .macro senduart,rd,rx --- a/arch/arm/mach-omap2/include/mach/debug-macro.S +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S @@ -46,7 +46,7 @@ omap_uart_lsr: .word 0 ldr \rv, [\rv, #0] cmp \rp, #0 @ is port configured? cmpne \rv, #0 - bne 99f @ already configured + bne 100f @ already configured /* Check the debug UART configuration set in uncompress.h */ mov \rp, pc @@ -135,7 +135,7 @@ omap_uart_lsr: .word 0 str \rp, [\rv, #0] b 10b -99: +100: .endm .macro senduart,rd,rx