From patchwork Wed May 8 13:29:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16796 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 98D7B238FB for ; Wed, 8 May 2013 13:30:34 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id c10sf2252473qcz.6 for ; Wed, 08 May 2013 06:30:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=SXCqGKA8DLj1NepbMO6TddrihX8P1bq6yXVomnDWSPY=; b=iU/uezP4e1c8+2lwC/DzHhjlV9GHJQOcPuPo+sSlA8/SZiErMF1tyCnnYBvseolxVB mNf36a09SO5HfDahvbOpUbsM2zXUIBpfEFKHVFPghRqNx4I5lFzLq9lkmNTBU2CIJb/Y YVGw4dtYTlnhIcWUmfmvMnu6OSDXPdCI5LEOvafLxFECc8V8lMum0x5ajrBULS8YTI/k Z54tSeNADuRMfz6mITxxiZ9VQYA4mR+R4q+ZChQHPepeiVPCYQxp1J8nHmSX5on2j4Tp CwFkh0hO5D7Ecrk1L37tgeaKQyLCh8f9cikKDplhbNUF3hEgwyjvF/pTGzI3Q5zjGBqk yciA== X-Received: by 10.58.85.231 with SMTP id k7mr4025254vez.10.1368019813560; Wed, 08 May 2013 06:30:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.96.234 with SMTP id dv10ls934999qeb.87.gmail; Wed, 08 May 2013 06:30:13 -0700 (PDT) X-Received: by 10.52.68.49 with SMTP id s17mr3822310vdt.92.1368019813125; Wed, 08 May 2013 06:30:13 -0700 (PDT) Received: from mail-vb0-x230.google.com (mail-vb0-x230.google.com [2607:f8b0:400c:c02::230]) by mx.google.com with ESMTPS id sa4si15082851vdc.10.2013.05.08.06.30.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 06:30:13 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::230 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::230; Received: by mail-vb0-f48.google.com with SMTP id q16so1527204vbe.21 for ; Wed, 08 May 2013 06:30:13 -0700 (PDT) X-Received: by 10.52.36.115 with SMTP id p19mr3834834vdj.8.1368019813053; Wed, 08 May 2013 06:30:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp6872veb; Wed, 8 May 2013 06:30:11 -0700 (PDT) X-Received: by 10.194.59.106 with SMTP id y10mr10904005wjq.28.1368019811336; Wed, 08 May 2013 06:30:11 -0700 (PDT) Received: from mail-we0-x22a.google.com (mail-we0-x22a.google.com [2a00:1450:400c:c03::22a]) by mx.google.com with ESMTPS id l10si9432439wjw.142.2013.05.08.06.30.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 06:30:11 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::22a; Received: by mail-we0-f170.google.com with SMTP id u54so1809658wes.15 for ; Wed, 08 May 2013 06:30:10 -0700 (PDT) X-Received: by 10.180.183.139 with SMTP id em11mr22070326wic.16.1368019810821; Wed, 08 May 2013 06:30:10 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id h8sm7063221wiz.9.2013.05.08.06.30.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 06:30:10 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones Subject: [PATCH 5/9] ARM: ux500: Fix incorrect DEBUG UART virtual addresses Date: Wed, 8 May 2013 14:29:05 +0100 Message-Id: <1368019749-19455-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368019749-19455-1-git-send-email-lee.jones@linaro.org> References: <1368019749-19455-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnhRRqozs6lqRL4EckWLI6iS4ivoCuWWvrol1smYVc8JuEQLpi5fzCXgntxXYPTf8taVNHx X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::230 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , A recent move to rid header files which were hindering multiplatform support forced address allocations out of the headers and into the files which were using them. We also lost some useful macros such as IO_ADDRESS(), so physical -> virtual addressing has been carried out manually in this case. Unfortunately the incorrect value was converted. This patch rectifies the error and ensures earlyprintk works again. Signed-off-by: Lee Jones --- arch/arm/include/debug/ux500.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/debug/ux500.S b/arch/arm/include/debug/ux500.S index 2848857..fbd24be 100644 --- a/arch/arm/include/debug/ux500.S +++ b/arch/arm/include/debug/ux500.S @@ -24,9 +24,9 @@ #define U8500_UART0_PHYS_BASE (0x80120000) #define U8500_UART1_PHYS_BASE (0x80121000) #define U8500_UART2_PHYS_BASE (0x80007000) -#define U8500_UART0_VIRT_BASE (0xa8120000) -#define U8500_UART1_VIRT_BASE (0xa8121000) -#define U8500_UART2_VIRT_BASE (0xa8007000) +#define U8500_UART0_VIRT_BASE (0xf8120000) +#define U8500_UART1_VIRT_BASE (0xf8121000) +#define U8500_UART2_VIRT_BASE (0xf8007000) #define __UX500_PHYS_UART(n) U8500_UART##n##_PHYS_BASE #define __UX500_VIRT_UART(n) U8500_UART##n##_VIRT_BASE #endif