mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 05/10] ARM: i.MX6: esdctl: Use symbolic constants for RAM base address
Date: Tue, 10 Apr 2018 16:53:18 -0700	[thread overview]
Message-ID: <20180410235323.5440-6-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180410235323.5440-1-andrew.smirnov@gmail.com>

Use symbolic constants for RAM base address, to do that rename
MX6_MMDC_PORT0_BASE_ADDR to MX6_MMDC_PORT01_BASE_ADDR to distinguish
it from SoCs with only one DDR controller (i.MX6UL) where port 0 will
always be at 0x80000000.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/boards/zii-imx6q-rdu2/lowlevel.c  | 2 +-
 arch/arm/mach-imx/esdctl.c                 | 8 ++++----
 arch/arm/mach-imx/include/mach/imx6-regs.h | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c b/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c
index 22ffdf85e..c9ef16ae0 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c
+++ b/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c
@@ -304,7 +304,7 @@ ENTRY_FUNCTION(start_imx6_zii_rdu2, r0, r1, r2)
 	 * When still running in SRAM, we need to setup the DRAM now and load
 	 * the remaining image.
 	 */
-	if (get_pc() < MX6_MMDC_PORT0_BASE_ADDR)
+	if (get_pc() < MX6_MMDC_PORT01_BASE_ADDR)
 		rdu2_sram_setup();
 
 	if (__imx6_cpu_revision() == IMX_CHIP_REV_2_0)
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index eda8184a0..3cd7c5738 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -378,12 +378,12 @@ static __maybe_unused struct imx_esdctl_data imx53_data = {
 };
 
 static __maybe_unused struct imx_esdctl_data imx6q_data = {
-	.base0 = MX6_MMDC_PORT0_BASE_ADDR,
+	.base0 = MX6_MMDC_PORT01_BASE_ADDR,
 	.add_mem = imx6_mmdc_add_mem,
 };
 
 static __maybe_unused struct imx_esdctl_data imx6ul_data = {
-	.base0 = 0x80000000,
+	.base0 = MX6_MMDC_PORT0_BASE_ADDR,
 	.add_mem = imx6_mmdc_add_mem,
 };
 
@@ -605,10 +605,10 @@ imx6_barebox_entry(unsigned long membase, void *boarddata)
 
 void __noreturn imx6q_barebox_entry(void *boarddata)
 {
-	imx6_barebox_entry(0x10000000, boarddata);
+	imx6_barebox_entry(MX6_MMDC_PORT01_BASE_ADDR, boarddata);
 }
 
 void __noreturn imx6ul_barebox_entry(void *boarddata)
 {
-	imx6_barebox_entry(0x80000000, boarddata);
+	imx6_barebox_entry(MX6_MMDC_PORT0_BASE_ADDR, boarddata);
 }
diff --git a/arch/arm/mach-imx/include/mach/imx6-regs.h b/arch/arm/mach-imx/include/mach/imx6-regs.h
index ac2aa2109..1ba22b5bc 100644
--- a/arch/arm/mach-imx/include/mach/imx6-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx6-regs.h
@@ -117,6 +117,8 @@
 
 #define MX6_SATA_BASE_ADDR		0x02200000
 
-#define MX6_MMDC_PORT0_BASE_ADDR	0x10000000
+#define MX6_MMDC_PORT01_BASE_ADDR	0x10000000
+#define MX6_MMDC_PORT0_BASE_ADDR	0x80000000
+
 
 #endif /* __MACH_IMX6_REGS_H */
-- 
2.14.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-04-10 23:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-10 23:53 [PATCH 00/10] Vybrid MMDC support and misc ESDCTL fixes Andrey Smirnov
2018-04-10 23:53 ` [PATCH 01/10] ARM: i.MX: esdctl: Use IOMEM instead of (void *) Andrey Smirnov
2018-04-10 23:53 ` [PATCH 02/10] ARM: i.MX51: esdctl: Replace magic value with ESDMISC_DDR2_8_BANK Andrey Smirnov
2018-04-10 23:53 ` [PATCH 03/10] ARM: i.MX6: esdctl: Share memory size calculation code Andrey Smirnov
2018-04-10 23:53 ` [PATCH 04/10] ARM: i.MX6: esdctl: Factor out common code in imx6*_barebox_entry() Andrey Smirnov
2018-04-10 23:53 ` Andrey Smirnov [this message]
2018-04-10 23:53 ` [PATCH 06/10] ARM: i.MX: esdctl: Make use of min_t() Andrey Smirnov
2018-04-10 23:53 ` [PATCH 07/10] ARM: i.MX: esdctl: Introduce memory_sdram_size() Andrey Smirnov
2018-04-10 23:53 ` [PATCH 08/10] ARM: i.MX: esdctl: Add support for Vybrid's memory controller Andrey Smirnov
2018-04-10 23:53 ` [PATCH 09/10] i.MX: vf610-twr: Make use of vf610_barebox_entry() Andrey Smirnov
2018-04-10 23:53 ` [PATCH 10/10] i.MX: zii-vf610-dev: " Andrey Smirnov
2018-04-11  9:07 ` [PATCH 00/10] Vybrid MMDC support and misc ESDCTL fixes 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=20180410235323.5440-6-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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