From patchwork Thu May 10 01:28: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: 911234 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="Oh8eYPE6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40hFxy75Hrz9s1w for ; Thu, 10 May 2018 11:29:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 99CC5C220FD; Thu, 10 May 2018 01:29: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_MSPIKE_H2, 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 D2494C221A4; Thu, 10 May 2018 01:28:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0A0D1C221E5; Thu, 10 May 2018 01:28:53 +0000 (UTC) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by lists.denx.de (Postfix) with ESMTPS id 642F0C21F9D for ; Thu, 10 May 2018 01:28:48 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id p14-v6so241441pfh.9 for ; Wed, 09 May 2018 18:28:48 -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=jbqcZumqM5jOQEZWafLT84Exo66VjGZqJRaztiCAaKU=; b=Oh8eYPE6WH42/XHL5lV5ruX9YmnWVP4/B1nnjA+ijodiM7Ef/rEPscKZJu/KX79Xde 9b/3T4xHxvxVAI1ety1gUhf7VGnWXCVQxC45LMeVsyDF6UeiV2UYfjxCXrwHmcDcgWQ7 gUQdHFo5qoPDW7hz++xrCJQQrQbLoDCo0bKB2/b/65KlyUJESlukqzJT++VTRvbzYYCf VB/v50gC+pMgAEbHqtIrMbMAtOjUePkF/ybZyrV+CrBrAn3gXuOL+IQbfl5xHAIgN5jQ vGFUOescA2aQBAc8qDg4sG6uH2rA2kWagXdBQq9G1JHixJICjDRNCrqeethn2JYOMkq4 gOLw== 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=jbqcZumqM5jOQEZWafLT84Exo66VjGZqJRaztiCAaKU=; b=DwdP0afL1yiAfhOvrQtf6C+j/s3IQPOoW7vXb9ZGhRbYKkbiI3xKbVvUss2l3Hl7tN IH5N1iDXybB3nxESWrDv7f8blO+0mHSGAYrjvYcKUOpw5nvODP/EQGJvzUaVw6RpTLuW ECPLu9bfYSIkIeuv4YDl8fLck0F6N7FjegV0pbUiKglZ0+K7pMcL5wKQt5jbPIxuOzYA hYyJbctHyXtIEPezdqmUdIYJSMqM6BsmFBelQ2CJ/es2GuqkKE2aFX+6rCNMIYjEjbdD rhxJnFLc0asurxr2WHQkb2btZL82Y116o9Tm5PgMiAdtsvAeSsbSM7CAL/CmsIVVPLQJ teVQ== X-Gm-Message-State: ALQs6tA/RpuObjrDC04bxtYxSDd96ZkuzUoMnqxPIgYBqmn+r31SLJne fsqS8KASZiDnfDi0CT2Z3NBGlvft X-Google-Smtp-Source: AB8JxZpZaIU5TKr/2MWydc292x4Zhj3n40iLJQMKRXAFSeE1DW0SHGpoWpZCJJiIyDdd+GLebYsNeA== X-Received: by 2002:a63:7c0b:: with SMTP id x11-v6mr34956590pgc.384.1525915726868; Wed, 09 May 2018 18:28:46 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id e87sm69712179pfl.65.2018.05.09.18.28.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 May 2018 18:28:46 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Thu, 10 May 2018 13:28:26 +1200 Message-Id: <20180510012831.21677-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180510012831.21677-1-judge.packham@gmail.com> References: <20180510012831.21677-1-judge.packham@gmail.com> Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Tuan Pham , Victor Axelrod , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 1/6] 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 --- Changes in v3: None Changes in v2: None 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 53ed4eab3203..3f30b6bf972e 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h +++ b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h @@ -46,6 +46,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 c99437be22aa..a87fc404cb7d 100644 --- a/drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h +++ b/drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h @@ -421,8 +421,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))