From patchwork Thu Jul 30 13:36:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51698 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id 1E5E122E7D for ; Thu, 30 Jul 2015 13:38:13 +0000 (UTC) Received: by laah7 with SMTP id h7sf14209500laa.2 for ; Thu, 30 Jul 2015 06:38:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:cc:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=odM4F//CgX6vdF3bg3bjckTcfDQYIxmoYVG3UcEdsOM=; b=eV0KUoq/mcVSKXy7MxAjeKuc7lcwqhgvY+jJWzFQWUB36wcDrSu4TEk4U5i7Q8sVJT qJLWV5M1/5bEBCLSPf/LlGOu2qUIeOWzmUg9SvlFlr57nchKsm02rP+c0YzKp6s/2+tU 8yUoSaRWZ8shFwcCIBDKJaIqwJ9IGBfUMNvYMbgdjElDLgRtw5w3kQxinZPlsGL4HZ+J eQ20+9MFVcTg2wLYbqZvi0eciL/sa1mzRzsslJfkoTV568qyWNnNsED8ovXSRa6731QC 7D4qTlsQvXZLaOaZ8wcgNEILMV3hjLrx5unUiW/VybHc0YOfjKWs2BA2svyaQGtvrjKm nJEQ== X-Gm-Message-State: ALoCoQli63LZ4BsJFa5wtGYQ9RkuFmBEYQ2TtpaChJM6RLAeQXMz89hR3hgWPb37dQmfBLqKmHEg X-Received: by 10.194.173.3 with SMTP id bg3mr17800668wjc.5.1438263491800; Thu, 30 Jul 2015 06:38:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.2 with SMTP id s2ls165202lal.86.gmail; Thu, 30 Jul 2015 06:38:11 -0700 (PDT) X-Received: by 10.152.203.162 with SMTP id kr2mr44515696lac.57.1438263491641; Thu, 30 Jul 2015 06:38:11 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id d5si847552laf.74.2015.07.30.06.38.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jul 2015 06:38:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by laah7 with SMTP id h7so25193279laa.0 for ; Thu, 30 Jul 2015 06:38:11 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr45339542lbc.32.1438263491472; Thu, 30 Jul 2015 06:38:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp621649lba; Thu, 30 Jul 2015 06:38:10 -0700 (PDT) X-Received: by 10.70.123.37 with SMTP id lx5mr107992777pdb.158.1438263489658; Thu, 30 Jul 2015 06:38:09 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id il7si2503600pac.156.2015.07.30.06.38.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jul 2015 06:38:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZKo0x-0008BD-56; Thu, 30 Jul 2015 13:36:51 +0000 Received: from mail-la0-f48.google.com ([209.85.215.48]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZKo0e-0007C3-4q for linux-arm-kernel@lists.infradead.org; Thu, 30 Jul 2015 13:36:34 +0000 Received: by lagw2 with SMTP id w2so25235072lag.3 for ; Thu, 30 Jul 2015 06:36:10 -0700 (PDT) X-Received: by 10.152.116.13 with SMTP id js13mr7913825lab.62.1438263370195; Thu, 30 Jul 2015 06:36:10 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by smtp.gmail.com with ESMTPSA id pw1sm258942lac.17.2015.07.30.06.36.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jul 2015 06:36:09 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: ux500: simplify and move debug UART Date: Thu, 30 Jul 2015 15:36:06 +0200 Message-Id: <1438263366-29756-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150730_063632_610394_5D9AE317 X-CRM114-Status: GOOD ( 13.24 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.48 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.48 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: Linus Walleij MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The debug UART code defined three different virtual addresses while only one is ever used. Get rid of this, and move the UART remapping to 0xfffe8000 where DTCM reside on some platforms but not on Ux500, so it can be reused moving the UART out of the vmalloc area. Signed-off-by: Linus Walleij --- arch/arm/include/debug/ux500.S | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/debug/ux500.S b/arch/arm/include/debug/ux500.S index aa7f63a8b5e0..aa3af7cb45e0 100644 --- a/arch/arm/include/debug/ux500.S +++ b/arch/arm/include/debug/ux500.S @@ -24,21 +24,16 @@ #define U8500_UART0_PHYS_BASE (0x80120000) #define U8500_UART1_PHYS_BASE (0x80121000) #define U8500_UART2_PHYS_BASE (0x80007000) -#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 -#if !defined(__UX500_PHYS_UART) || !defined(__UX500_VIRT_UART) +#if !defined(__UX500_PHYS_UART) #error Unknown SOC #endif #define UX500_PHYS_UART(n) __UX500_PHYS_UART(n) -#define UX500_VIRT_UART(n) __UX500_VIRT_UART(n) #define UART_PHYS_BASE UX500_PHYS_UART(CONFIG_UX500_DEBUG_UART) -#define UART_VIRT_BASE UX500_VIRT_UART(CONFIG_UX500_DEBUG_UART) +#define UART_VIRT_BASE (0xfff07000) .macro addruart, rp, rv, tmp ldr \rp, =UART_PHYS_BASE @ no, physical address