From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/4] ARM: mx6: ddr: Add support for iMX6SX
Date: Tue, 26 Nov 2019 09:34:52 +0100 [thread overview]
Message-ID: <20191126083452.4605-4-marex@denx.de> (raw)
In-Reply-To: <20191126083452.4605-1-marex@denx.de>
This patch adds support for iMX6SX MMDC into the DDR calibration
code. The only difference between MX6DQ and MX6SX is that the SX
has 2 SDQS registers, while the DQ has 8.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Eric Nelson <eric@nelint.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
arch/arm/mach-imx/mx6/ddr.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index b2402f75db..8ed8b79c8b 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -247,12 +247,22 @@ int mmdc_do_write_level_calibration(struct mx6_ddr_sysinfo const *sysinfo)
static void mmdc_set_sdqs(bool set)
{
- struct mx6dq_iomux_ddr_regs *mx6_ddr_iomux =
+ struct mx6dq_iomux_ddr_regs *mx6dq_ddr_iomux =
(struct mx6dq_iomux_ddr_regs *)MX6DQ_IOM_DDR_BASE;
- u32 sdqs = (u32)(&mx6_ddr_iomux->dram_sdqs0);
- int i;
+ struct mx6sx_iomux_ddr_regs *mx6sx_ddr_iomux =
+ (struct mx6sx_iomux_ddr_regs *)MX6SX_IOM_DDR_BASE;
+ int i, sdqs_cnt;
+ u32 sdqs;
+
+ if (is_mx6sx()) {
+ sdqs = (u32)(&mx6sx_ddr_iomux->dram_sdqs0);
+ sdqs_cnt = 2;
+ } else { /* MX6DQ */
+ sdqs = (u32)(&mx6dq_ddr_iomux->dram_sdqs0);
+ sdqs_cnt = 8;
+ }
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < sdqs_cnt; i++) {
if (set)
setbits_le32(sdqs + (4 * i), 0x7000);
else
--
2.24.0
next prev parent reply other threads:[~2019-11-26 8:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 8:34 [U-Boot] [PATCH 1/4] ARM: mx6: ddr: Make debug prints work with tiny printf Marek Vasut
2019-11-26 8:34 ` [U-Boot] [PATCH 2/4] ARM: mx6: ddr: Factor out SDQS configuration code Marek Vasut
2019-11-26 16:26 ` Eric Nelson
2019-12-29 10:27 ` sbabic at denx.de
2019-11-26 8:34 ` [U-Boot] [PATCH 3/4] ARM: mx6: ddr: Configure all SDQS pullups using loop Marek Vasut
2019-11-26 16:26 ` Eric Nelson
2019-12-29 10:26 ` sbabic at denx.de
2019-11-26 8:34 ` Marek Vasut [this message]
2019-11-26 16:26 ` [U-Boot] [PATCH 4/4] ARM: mx6: ddr: Add support for iMX6SX Eric Nelson
2019-12-29 10:24 ` sbabic at denx.de
2019-11-26 16:19 ` [U-Boot] [PATCH 1/4] ARM: mx6: ddr: Make debug prints work with tiny printf Eric Nelson
2019-12-29 10:25 ` sbabic at denx.de
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=20191126083452.4605-4-marex@denx.de \
--to=marex@denx.de \
--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