From patchwork Mon Dec 17 08:35:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1014352 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="lpsVoz6a"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43JF1y0pRMz9s2P for ; Mon, 17 Dec 2018 19:39:18 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C5134C21D8A; Mon, 17 Dec 2018 08:37:31 +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, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 65004C21FE4; Mon, 17 Dec 2018 08:36:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4F53EC21E45; Mon, 17 Dec 2018 08:36:10 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 18D83C21E49 for ; Mon, 17 Dec 2018 08:36:07 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id y1so5776504plp.9 for ; Mon, 17 Dec 2018 00:36:07 -0800 (PST) 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=9NTbHXkTPNWf6ub75Wnjvb0UAy/NFLJcfqL2PUJD9U0=; b=lpsVoz6aJ7ddAbL5wa6uuJBucLMwUVwMVSK5Af8Hiv25qVXRBEfcTrDPmnNFtaD2eV ANkOrmdcgKo9Ii+jCyR6yYNBHHvwuSzNRJvW3tE1uk9q5g0yQBLkb+0RQ8QMvqFyLq7F JQWYv574YwPY4MRMDNq9paqIIu5zjxImZ9a3uRZ6+9tsDqyYXWQPmqQpJ2r8FUomSLhR NpKspOEaVgPdfXK+MvPWMX1i/8y5TPwRe3i2ERISXblkGxVJuuIp3ff0F9XOf+AhFd4G 5Gka4xvL8Lal+q/VysFTl1/RUzfJtW6Z2qxGR7Gw5WD2jCShBxvgSin+KPxFvOn9Oxhq Yi6A== 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=9NTbHXkTPNWf6ub75Wnjvb0UAy/NFLJcfqL2PUJD9U0=; b=X4/toYN9E3oV305L3h/5KvpNxSAQd/51AZCIg0l2mGidbGfK5ToRP/2wPL8jkjql80 7USqtVJJsZeVKAV6T6LO0ctqctSoIKf3QedkX2xG0wK1Uw4QQGmI6COMfGdCZJ4WOAwF sBIRd7FHvAgCRF15Bah4wU3WUP6X95zs+sJN1eMypZoz9KregL7MZ/7Q76lRX1FLLopv 2o7rwzHhxfZkyCXb1kj2/0LfrwwKoswSjTR0EWBoFRWUodb2bH0a/Hab+pmWA0fF7CUV 6VfkxJ2TcWQoP5HvE/4gF3txL/5IFZDb2L/DmPjSBcqwKxYfWCXp+RgUFOM6+f6Eyf9N qNjw== X-Gm-Message-State: AA+aEWbDWAYQQG8DmZ9neOGYD+SHb5jppg+0ghktPU5blUE2gXnmx3g0 2sIudgXAl7Bo0sDffCybGm2DS+tKZjc= X-Google-Smtp-Source: AFSGD/UWnvlxi+qRLnGGJUTN6YJnQALpeJ21vF7A85+DyE97Xhn2MHcRHDa7v5zK6xZukjUuo1oOVQ== X-Received: by 2002:a17:902:24a2:: with SMTP id w31mr11726639pla.216.1545035765428; Mon, 17 Dec 2018 00:36:05 -0800 (PST) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id o4sm20469787pgs.12.2018.12.17.00.36.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Dec 2018 00:36:04 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de Date: Mon, 17 Dec 2018 21:35:26 +1300 Message-Id: <20181217083529.19030-5-judge.packham@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181217083529.19030-1-judge.packham@gmail.com> References: <20181217083529.19030-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Stefan Roese , Luka Perkov , Prafulla Wadaskar , Chris Packham , Tom Rini Subject: [U-Boot] [RFC PATCH v1 4/7] 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 --- 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