From patchwork Mon Dec 17 08:35:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1014353 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="bdH0DfBj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43JF3820Wbz9sDN for ; Mon, 17 Dec 2018 19:40:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CDCA2C22058; Mon, 17 Dec 2018 08:37:14 +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 28A84C22012; Mon, 17 Dec 2018 08:36:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3257DC21EE5; Mon, 17 Dec 2018 08:36:06 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by lists.denx.de (Postfix) with ESMTPS id 6BE02C21E2C for ; Mon, 17 Dec 2018 08:36:02 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id u6so5998585pfh.11 for ; Mon, 17 Dec 2018 00:36:02 -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=npSIWpsJ1fDFZz+7Nd/X4Ver8IRZe8lxD2g/r2+yqfU=; b=bdH0DfBjguTFWXh0BDF9E8IsARN6EErgUQ9n1XmMC7OdritenRIKUVD3GeuUqIf1Lm cdRbtkxlPdx6JEusu0L9Ta8Hz2HE2NzD1ZZgzjN66cMFT1gDatn1pl8+O7xhWZaQQsxG UVI0J019Tj1NZx3xsexkRoLCbkAvdpVD3NxRn+DcNIQd6/UC5Wgq9uJ3nMA4PZwsgfmo O7WqPrcOFIh67IVLo3rfD8jo5261IgaDF+w6PKo+GTkkZtRMgxJ6pZXoqTMZqZFoTXJC R41+hSrK99Z6zZKFtpsTWCA280/Ht6Vy8e8vbZXj4X6wjZcwuVnEEjkfK4wuZSA/SH5n 4MNg== 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=npSIWpsJ1fDFZz+7Nd/X4Ver8IRZe8lxD2g/r2+yqfU=; b=GfPL8xZAgPcT7ME34S7o5l/EJ721CSUojP21PRTEiVgmWXsP642Z0J/tcNh0yPdsvz ynDPkbhD30Ww/OHQeiHWvIRBe/nBTrbwhgv16V1+/ruSeFrTJvxlBSZoFh1iy/xsXpg2 j38qJ4BIce0kFGz12dYWRNriLhxd9w5Mt521bCgHJ9zRiWmCSnju6wocOh7rEp9ZN4vG 9DRPIGODRQaSAoZgX4yTWrMZh0ZWLE0SY5ycCZM6qg5zYRcCooq3gzkwmkv59otNc/kj Jhv6ZTWpaRIYfachPWY9wvJqEa1RllxiegMBCLgXdjsEzxzv0rbvE++fVPKpIbGNfxsn n2sw== X-Gm-Message-State: AA+aEWYsKW2Xom0EfWcYXausX0EIbP04gQQfXPtPsUeldX5MYaHeva3x JONjRpd5C2IJUqQYAffLClKS1/SiTqk= X-Google-Smtp-Source: AFSGD/Vm3LsTMzXfxwYTjoO2rTX14cXPYr55QTH5oY3LvhjLmneS+WZcLq4Eei9wfK2bo677DMGsQA== X-Received: by 2002:a62:109b:: with SMTP id 27mr11785098pfq.227.1545035760741; Mon, 17 Dec 2018 00:36:00 -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.35.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Dec 2018 00:36:00 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de Date: Mon, 17 Dec 2018 21:35:25 +1300 Message-Id: <20181217083529.19030-4-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 3/7] ARM: kirkwood: rename KW_CPU_WIN_BASE to MVEBU_CPU_WIN_BASE 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" This will allow the kirkwood platforms to use more common code with the other mvebu SoCs. Signed-off-by: Chris Packham --- arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index d54de53f31dc..1e733dc5fbc1 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -62,7 +62,7 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval) int kw_config_adr_windows(void) { struct kwwin_registers *winregs = - (struct kwwin_registers *)KW_CPU_WIN_BASE; + (struct kwwin_registers *)MVEBU_CPU_WIN_BASE; /* Window 0: PCIE MEM address space */ writel(KWCPU_WIN_CTRL_DATA(1024 * 1024 * 256, KWCPU_TARGET_PCIE, diff --git a/arch/arm/mach-kirkwood/include/mach/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h index 227707ae4c95..1d7f2828cd38 100644 --- a/arch/arm/mach-kirkwood/include/mach/soc.h +++ b/arch/arm/mach-kirkwood/include/mach/soc.h @@ -31,7 +31,7 @@ #define KW_RTC_BASE (KW_REGISTER(0x10300)) #define KW_NANDF_BASE (KW_REGISTER(0x10418)) #define MVEBU_SPI_BASE (KW_REGISTER(0x10600)) -#define KW_CPU_WIN_BASE (KW_REGISTER(0x20000)) +#define MVEBU_CPU_WIN_BASE (KW_REGISTER(0x20000)) #define KW_CPU_REG_BASE (KW_REGISTER(0x20100)) #define MVEBU_TIMER_BASE (KW_REGISTER(0x20300)) #define KW_REG_PCIE_BASE (KW_REGISTER(0x40000))