From patchwork Wed Apr 4 05:23:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 894866 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="u1HiqBqA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40GDtF00RGz9rx7 for ; Wed, 4 Apr 2018 15:24:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A53B8C21E3B; Wed, 4 Apr 2018 05:24:06 +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_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 E6E5FC21E39; Wed, 4 Apr 2018 05:23:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6477DC21E52; Wed, 4 Apr 2018 05:23:33 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id 7123AC21D83 for ; Wed, 4 Apr 2018 05:23:28 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id u11-v6so12512166plq.1 for ; Tue, 03 Apr 2018 22:23:28 -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; bh=KCqkk+xCdAE5NTUNROy66/mG8I3aC/X4hBnShQAop+M=; b=u1HiqBqAc2MNWUQVE/UKJFNd0yP0pObGIDV23rAYJRatVe2JRiZQFqHF3Phla2DN2F cU0SdXsC7+V0Fc0Ld7UPz9HbEAnId3soxzvfqIRh/n3wXlrfiedmBcifaDRIUlD1MCvJ b45a20eFzh74BJgRG/Mpz8ZipslEHulD1xUC2gzGi549qp1GDFO67WaGLukk6gYjuSL2 6BpxyOAxx7+FEwsQPL6uf7ayRTy+hZXqHouVG8zE/3T5c6puvD3s/Cf+yrXBxkPCZFpa 1J9VK7n9MYvHz0T8uvrrquNyhAk0r4zUiDEU8kAt9Oeqtpae9kQiy26lqAbGuNt3UUj3 LJtA== 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; bh=KCqkk+xCdAE5NTUNROy66/mG8I3aC/X4hBnShQAop+M=; b=sJHEVXdhMUk/eAo/17mFURpI2CvHY3UkO3C/vLmRVdP3u/VMcEWioXcnJcF/H8o9dZ ixzbQdCNOGuQoNHHPKmEytoMdLHFSd/EBIoXUCclMQGbjJS9FwTwc/WKKolfU1f6SiGp 2hqDcxBHii6Txawk5xjH3nTpMAaw8bl6zQC1JUFJIym2XrWxyGq57hLX9ql6fvpxmN8C s5qv6fm+Kt9OHW4PAzSNtQVqcRfUq6DgDXL+g7W1rFFCrmJtwBYG40WdqLtIB6UYuL/z TdhTMJw2QjYSwbLpv7XMJY4IlUwOBVttKmE2p7Bnx53p7fjMrPl7BxduLe/ajL7F1Azh V4vA== X-Gm-Message-State: AElRT7ELs205AiT7YzaYb/Uqcydp9VHgStAeG/cL4jTDeG3Jy4gWgphn sesY9O8apa2mBdJxYQYRXoBf3IRY X-Google-Smtp-Source: AIpwx48AOc1KGr6kbvG2JYn/XDW0HL/nqFDQNVi4aYkjF9ZNsFtlOcWuY7hAU02iG4w2rbCc2I+ptg== X-Received: by 2002:a17:902:1744:: with SMTP id i62-v6mr17304445pli.62.1522819406960; Tue, 03 Apr 2018 22:23:26 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id h20sm2680863pfn.118.2018.04.03.22.23.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Apr 2018 22:23:26 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 4 Apr 2018 17:23:12 +1200 Message-Id: <20180404052313.24830-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180404052313.24830-1-judge.packham@gmail.com> References: <20180404052313.24830-1-judge.packham@gmail.com> Cc: Prafulla Wadaskar , Luka Perkov , Tuan Pham , Victor Axelrod , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v1 1/2] ARM: mvebu: a38x: move definition of PEX_CFG_DIRECT_ACCESS 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" PEX_CFG_DIRECT_ACCESS was defined in ddr3_hws_hw_training_def.h despite only being used in the serdes code. Move this definition to ctrl_pex.h where all the other PEX defines are. Also remove the duplicate definition of PEX_DEVICE_AND_VENDOR_ID which is already defined in ctrl_pex.h. Signed-off-by: Chris Packham --- arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h | 1 + drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h index ca8a4d206a36..d6f0d4fcd381 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h +++ b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h @@ -47,6 +47,7 @@ /* Controller revision info */ #define PEX_DEVICE_AND_VENDOR_ID 0x000 +#define PEX_CFG_DIRECT_ACCESS(if, reg) (PEX_IF_REGS_BASE(if) + (reg)) /* PCI Express Configuration Address Register */ #define PXCAR_REG_NUM_OFFS 2 diff --git a/drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h b/drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h index 06d0ab10aa2a..bca0af89a72d 100644 --- a/drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h +++ b/drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h @@ -422,8 +422,6 @@ /* Power Management Clock Gating Control Register */ #define POWER_MNG_CTRL_REG 0x18220 -#define PEX_DEVICE_AND_VENDOR_ID 0x000 -#define PEX_CFG_DIRECT_ACCESS(if, reg) (PEX_IF_REGS_BASE(if) + (reg)) #define PMC_PEXSTOPCLOCK_OFFS(p) ((p) < 8 ? (5 + (p)) : (18 + (p))) #define PMC_PEXSTOPCLOCK_MASK(p) (1 << PMC_PEXSTOPCLOCK_OFFS(p)) #define PMC_PEXSTOPCLOCK_EN(p) (1 << PMC_PEXSTOPCLOCK_OFFS(p))