From patchwork Thu May 14 16:12:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 48516 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE5DB21411 for ; Thu, 14 May 2015 16:17:00 +0000 (UTC) Received: by wivs14 with SMTP id s14sf24449523wiv.1 for ; Thu, 14 May 2015 09:16:59 -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:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=mKrEF/jKVUaFHXVKBp8fIsLTTj7xCUyHAchAbvl8mnk=; b=dudO4HdCfl62y8Un/MawfOwMU1F5pqi/Srv7XzTWJHV8MDlUYyXzMyOG5vBTqCSDcu hHyfrRzGsqMWT5300pmXQUeCc8LXluLCWEa4lhh5uptDb4BsA/hQRRHk5EPeNMWe2zTr hn8ZiEGbseclgraEa+QrQu05w0S+xiMdlcNVOFVgdNN36z75hKHjZs6cxRdxsVdbAY2W 3H1yB1RxcbamD2Twf0dzIFBuMZpnnarj9l3TCWOoyKggV6NWUy0SfTLfjEvm7TnKYnUC Zm+sOUsMFavDSFiIXWhkBcU3Nv2rsZp446N0t9taP9LjBHLK32tKN1zngjgSqzfLfoZx SJzQ== X-Gm-Message-State: ALoCoQnjw73eqbr0QcCf6i5G05W4TKSPMlFk1wi6JAZJedhuoMZYtPzG9SaqnUgbrNg7DZ0WOqEy X-Received: by 10.152.87.140 with SMTP id ay12mr3555941lab.8.1431620219802; Thu, 14 May 2015 09:16:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.116.7 with SMTP id js7ls400781lab.34.gmail; Thu, 14 May 2015 09:16:59 -0700 (PDT) X-Received: by 10.112.161.197 with SMTP id xu5mr3733904lbb.69.1431620219664; Thu, 14 May 2015 09:16:59 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id dn7si14857436lbb.71.2015.05.14.09.16.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 09:16:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by laat2 with SMTP id t2so74931200laa.1 for ; Thu, 14 May 2015 09:16:59 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr3713104lbc.41.1431620219585; Thu, 14 May 2015 09:16:59 -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.108.230 with SMTP id hn6csp1379116lbb; Thu, 14 May 2015 09:16:58 -0700 (PDT) X-Received: by 10.66.192.199 with SMTP id hi7mr9744364pac.15.1431620217918; Thu, 14 May 2015 09:16:57 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bw4si33005659pbd.227.2015.05.14.09.16.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 09:16:57 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) 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 1YsvmU-0006ZX-6F; Thu, 14 May 2015 16:14:42 +0000 Received: from mail-la0-f53.google.com ([209.85.215.53]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ysvkm-0005Lv-VC for linux-arm-kernel@lists.infradead.org; Thu, 14 May 2015 16:12:57 +0000 Received: by laat2 with SMTP id t2so74752922laa.1 for ; Thu, 14 May 2015 09:12:34 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr3719634lag.112.1431619954397; Thu, 14 May 2015 09:12:34 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id f4sm6257780lbd.49.2015.05.14.09.12.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 09:12:33 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/10] ARM: ux500: delete UART static map Date: Thu, 14 May 2015 18:12:27 +0200 Message-Id: <1431619947-14850-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150514_091257_294918_A0365BEE X-CRM114-Status: GOOD ( 11.74 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.53 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.53 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , 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.43 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 Delete the static maps for the Ux500 UARTs and rely on debug_ll_io_init() to do the trick. commit f87b95dd2e4a8832b1d6034f15a5324db42608a0 "ARM: ux500: move debugmacro to debug includes" defined the necessary addruart macro two years ago. Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/cpu-db8500.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 537a7753afc1..391d329a7e88 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -43,12 +43,6 @@ static struct prcmu_pdata db8500_prcmu_pdata = { .legacy_offset = DB8500_PRCMU_LEGACY_OFFSET, }; -/* minimum static i/o mapping required to boot U8500 platforms */ -static struct map_desc u8500_uart_io_desc[] __initdata = { - __IO_DEV_DESC(U8500_UART0_BASE, SZ_4K), - __IO_DEV_DESC(U8500_UART2_BASE, SZ_4K), -}; - /* U8500 and U9540 common io_desc */ static struct map_desc u8500_common_io_desc[] __initdata = { /* SCU base also covers GIC CPU BASE and TWD with its 4K page */ @@ -73,11 +67,7 @@ static struct map_desc u9540_io_desc[] __initdata = { static void __init u8500_map_io(void) { - /* - * Map the UARTs early so that the DEBUG_LL stuff continues to work. - */ - iotable_init(u8500_uart_io_desc, ARRAY_SIZE(u8500_uart_io_desc)); - + debug_ll_io_init(); ux500_map_io(); iotable_init(u8500_common_io_desc, ARRAY_SIZE(u8500_common_io_desc));