From: Chris Packham <judge.packham@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 1/6] ARM: mvebu: a38x: move definition of PEX_CFG_DIRECT_ACCESS
Date: Mon, 9 Apr 2018 22:12:52 +1200 [thread overview]
Message-ID: <20180409101257.3899-2-judge.packham@gmail.com> (raw)
In-Reply-To: <20180409101257.3899-1-judge.packham@gmail.com>
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 <judge.packham@gmail.com>
---
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 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))
--
2.16.2
next prev parent reply other threads:[~2018-04-09 10:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-09 10:12 [U-Boot] [PATCH v2 0/6] ARM: mvebu: a38x: updates to ddr training code Chris Packham
2018-04-09 10:12 ` Chris Packham [this message]
2018-04-09 10:12 ` [U-Boot] [PATCH v2 2/6] ARM: mvebu: a38x: move sys_env_device_rev_get Chris Packham
2018-04-09 10:12 ` [U-Boot] [PATCH v2 3/6] ARM: mvebu: a38x: remove some unused code Chris Packham
2018-04-09 10:12 ` [U-Boot] [PATCH v2 4/6] ARM: mvebu: a38x: sync ddr training code with upstream Chris Packham
2018-04-09 10:12 ` [U-Boot] [PATCH v2 5/6] ARM: mvebu: a38x: restore support for setting timing Chris Packham
2018-04-09 10:12 ` [U-Boot] [PATCH v2 6/6] ARM: mvebu: a38x: use non-zero size for ddr scrubbing Chris Packham
2018-05-09 10:23 ` [U-Boot] [PATCH v2 0/6] ARM: mvebu: a38x: updates to ddr training code Stefan Roese
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180409101257.3899-2-judge.packham@gmail.com \
--to=judge.packham@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox