From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Trent Piepho <tpiepho@gmail.com>, Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 5/8] ddr: imx8m: add i.MX8MN (Nano) support
Date: Fri, 1 Oct 2021 12:09:46 +0200 [thread overview]
Message-ID: <20211001100949.6891-6-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20211001100949.6891-1-a.fatoum@pengutronix.de>
DRAM setup on i.MX8MP is the same as on the i.MX8MP, except for
DDRC_DDR_SS_GPR0, which the vendor's U-Boot port explicitly skips
on the nano, irrespective of the configured DRAM type. Do likewise.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/ddr/imx8m/Kconfig | 2 +-
drivers/ddr/imx8m/ddr_init.c | 8 +++++++-
drivers/ddr/imx8m/ddrphy_utils.c | 1 +
include/soc/imx8m/ddr.h | 2 ++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/ddr/imx8m/Kconfig b/drivers/ddr/imx8m/Kconfig
index 7673ab5b4ccb..efc50c21d4c4 100644
--- a/drivers/ddr/imx8m/Kconfig
+++ b/drivers/ddr/imx8m/Kconfig
@@ -1,5 +1,5 @@
menu "i.MX8M DDR controllers"
- depends on ARCH_IMX8MQ || ARCH_IMX8MM || ARCH_IMX8MP
+ depends on ARCH_IMX8MQ || ARCH_IMX8MM || ARCH_IMX8MN || ARCH_IMX8MP
config IMX8M_DRAM
bool "imx8m dram controller support"
diff --git a/drivers/ddr/imx8m/ddr_init.c b/drivers/ddr/imx8m/ddr_init.c
index 34da44af6446..95ac76efcddb 100644
--- a/drivers/ddr/imx8m/ddr_init.c
+++ b/drivers/ddr/imx8m/ddr_init.c
@@ -48,6 +48,7 @@ static int imx8m_ddr_init(struct dram_timing_info *dram_timing,
reg32_write(src_ddrc_rcr + 0x04, 0x8f000000);
break;
case DDRC_TYPE_MM:
+ case DDRC_TYPE_MN:
case DDRC_TYPE_MP:
reg32_write(src_ddrc_rcr, 0x8f00001f);
reg32_write(src_ddrc_rcr, 0x8f00000f);
@@ -88,7 +89,7 @@ static int imx8m_ddr_init(struct dram_timing_info *dram_timing,
/* if ddr type is LPDDR4, do it */
tmp = reg32_read(DDRC_MSTR(0));
- if (tmp & (0x1 << 5))
+ if (tmp & (0x1 << 5) && type != DDRC_TYPE_MN)
reg32_write(DDRC_DDR_SS_GPR0, 0x01); /* LPDDR4 mode */
/* determine the initial boot frequency */
@@ -197,6 +198,11 @@ int imx8mm_ddr_init(struct dram_timing_info *dram_timing)
return imx8m_ddr_init(dram_timing, DDRC_TYPE_MM);
}
+int imx8mn_ddr_init(struct dram_timing_info *dram_timing)
+{
+ return imx8m_ddr_init(dram_timing, DDRC_TYPE_MN);
+}
+
int imx8mq_ddr_init(struct dram_timing_info *dram_timing)
{
return imx8m_ddr_init(dram_timing, DDRC_TYPE_MQ);
diff --git a/drivers/ddr/imx8m/ddrphy_utils.c b/drivers/ddr/imx8m/ddrphy_utils.c
index a56033f78032..79bb76c35a2a 100644
--- a/drivers/ddr/imx8m/ddrphy_utils.c
+++ b/drivers/ddr/imx8m/ddrphy_utils.c
@@ -321,6 +321,7 @@ static int dram_pll_init(enum ddr_rate drate, enum ddrc_type type)
case DDRC_TYPE_MQ:
return dram_sscg_pll_init(drate);
case DDRC_TYPE_MM:
+ case DDRC_TYPE_MN:
case DDRC_TYPE_MP:
return dram_frac_pll_init(drate);
default:
diff --git a/include/soc/imx8m/ddr.h b/include/soc/imx8m/ddr.h
index 78b15f1d461a..a25274c57671 100644
--- a/include/soc/imx8m/ddr.h
+++ b/include/soc/imx8m/ddr.h
@@ -365,11 +365,13 @@ extern struct dram_timing_info dram_timing;
enum ddrc_type {
DDRC_TYPE_MM,
+ DDRC_TYPE_MN,
DDRC_TYPE_MQ,
DDRC_TYPE_MP,
};
int imx8mm_ddr_init(struct dram_timing_info *timing_info);
+int imx8mn_ddr_init(struct dram_timing_info *timing_info);
int imx8mq_ddr_init(struct dram_timing_info *timing_info);
int imx8mp_ddr_init(struct dram_timing_info *timing_info);
int ddr_cfg_phy(struct dram_timing_info *timing_info, enum ddrc_type type);
--
2.30.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-10-01 10:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 10:09 [PATCH v2 0/8] ARM: i.MX8M: add nano support Ahmad Fatoum
2021-10-01 10:09 ` [PATCH v2 1/8] ARM: i.MX: add i.MX8MN (Nano) SoC support boilerplate Ahmad Fatoum
2021-10-01 10:09 ` [PATCH v2 2/8] clk: imx: add i.MX8MN (Nano) support Ahmad Fatoum
2021-10-01 10:09 ` [PATCH v2 3/8] ARM: i.MX8MN: adapt early clock support Ahmad Fatoum
2021-10-01 10:09 ` [PATCH v2 4/8] ARM: i.MX: extend drivers for i.MX8MN (Nano) support Ahmad Fatoum
2021-10-01 10:09 ` Ahmad Fatoum [this message]
2021-10-01 10:09 ` [PATCH v2 6/8] ddr: imx8m: ddrphy_train: add DDR4 support Ahmad Fatoum
2021-10-01 10:09 ` [PATCH v2 7/8] scripts: imx: add i.MX8MN support to imx-image Ahmad Fatoum
2021-10-01 10:09 ` [PATCH v2 8/8] ARM: i.MX8MN: add i.MX8MN-EVK support Ahmad Fatoum
2021-10-05 7:06 ` [PATCH v2 0/8] ARM: i.MX8M: add nano support Sascha Hauer
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=20211001100949.6891-6-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=tpiepho@gmail.com \
/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