From patchwork Wed Mar 13 07:47:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055939 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Xo2ek+jx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3rt5h7wz9s3l for ; Wed, 13 Mar 2019 18:49:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 83B16C21E07; Wed, 13 Mar 2019 07:49:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E255EC21FAE; Wed, 13 Mar 2019 07:48:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C03D2C21F19; Wed, 13 Mar 2019 07:48:09 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 3472AC21F4D for ; Wed, 13 Mar 2019 07:47:38 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id u9so921296pgo.7 for ; Wed, 13 Mar 2019 00:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pioLtiKywBFxTxbfQ0zoVdB28zUn+wAlJ20WAb37Qxo=; b=Xo2ek+jxv5z4HGNX0Er98Xr+syAgWWWQWm36gfMTwTxCB+yKUVY3SomNRrOxXxxynf Q30qiQfYRZvymFF1K708gjOVbQ2e7m8TK2G6aSjePLUuvFaVmZIrfLYt56JNOgAT2dzb Wcai3lyqPhtixGGqOqu7zF40kuky2SE6xCm39JZQKa152mZh061W2Kky9I6wpMVw57kd DLufmPN9Fc1dVvpvXZGaiIds7pz07EZZnsZk9DhGgOo9XBEBuq+cDXlzRcGLZtGJo3KY uYlzqkEPrkKrJafV1usGPXe8Cr0uUPPQMFM5ISs0rTfwFX0C5nMjd+ePNbM1CXmtiiVy uCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pioLtiKywBFxTxbfQ0zoVdB28zUn+wAlJ20WAb37Qxo=; b=eFRDpfYK4z2P1LGkBstKSMUkSuVwT3EqAl9d8xVe6FLyEwjRcdmxsM13cgZ/48vb7h /mgZXpfeoTJ/jRXKJnPywvllA8w9tMYtXOM7DEpYKYPyobw1OCYBF0Md6pFLP7PuEQ3c mq3ZvnuYIcyCx8pI5mJOUVsHEkLmaeIXCAThmO+HACCHRzTbrPvh9684uu7b29ILd7W2 JFsd8S49g1/7q0OwKexicNZb9zY2kpNyYztjfbwQBw+E4VQJ0ZQPIqRTv6z3yFcjyH1N 87d7efeUMHdyWPknXptrbIRn6ZQmYD+loYqqE0E6Kz5XVlwEdq0SWY/zRJuE1dT1VkY4 32qQ== X-Gm-Message-State: APjAAAVyyF5CIeIfjeI4EEjC0N0FscUIMfBhwGdf8Gg1kcNijwGOW8Bs SPi5tOlK1nD73bl7wf0FSOnm9FPJtxs= X-Google-Smtp-Source: APXvYqxQsx2RpYpUr160mfZI+Hjg2r0ndSfftWfGSCQ1PHDLOFb7lFGJ/NyK8o+mRSJYU/OJmwwVAw== X-Received: by 2002:aa7:83ca:: with SMTP id j10mr42822403pfn.50.1552463256608; Wed, 13 Mar 2019 00:47:36 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:36 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:02 +1300 Message-Id: <20190313074711.27757-4-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 03/12] ARM: kirkwood: remove KW_DEFADR_PCI_IO_REMAP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" KW_DEFADR_PCI_IO_REMAP has the same value as KW_DEFADR_PCI_IO and is only used to set up a 1:1 mapping. Remove it and update the mapping to use KW_DEFADR_PCI_IO. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/cpu.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 1e733dc5fbc1..95dd07f840ca 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -76,7 +76,7 @@ int kw_config_adr_windows(void) writel(KWCPU_WIN_CTRL_DATA(1024 * 64, KWCPU_TARGET_PCIE, KWCPU_ATTR_PCIE_IO, KWCPU_WIN_ENABLE), &winregs[1].ctrl); writel(KW_DEFADR_PCI_IO, &winregs[1].base); - writel(KW_DEFADR_PCI_IO_REMAP, &winregs[1].remap_lo); + writel(KW_DEFADR_PCI_IO, &winregs[1].remap_lo); writel(0x0, &winregs[1].remap_hi); /* Window 2: NAND Flash address space */ diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h index 91d21518d852..c35cace844ae 100644 --- a/arch/arm/mach-kirkwood/include/mach/cpu.h +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h @@ -63,7 +63,6 @@ enum kwcpu_attrib { */ #define KW_DEFADR_PCI_MEM 0x90000000 #define KW_DEFADR_PCI_IO 0xC0000000 -#define KW_DEFADR_PCI_IO_REMAP 0xC0000000 #define KW_DEFADR_SASRAM 0xC8010000 #define KW_DEFADR_NANDF 0xD8000000 #define KW_DEFADR_SPIF 0xE8000000