From: Christian Hemp <c.hemp@phytec.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/4] imx6: read back memory size
Date: Fri, 25 Apr 2014 13:54:26 +0200 [thread overview]
Message-ID: <1398426868-30285-2-git-send-email-c.hemp@phytec.de> (raw)
In-Reply-To: <1398426868-30285-1-git-send-email-c.hemp@phytec.de>
To reduce the devicetree files for one board with different memory sizes the
memory size can be read back from i.MX6.
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
arch/arm/mach-imx/esdctl.c | 67 ++++++++++++++++++++++++++++
arch/arm/mach-imx/include/mach/imx6-mmdc.h | 9 ++++
arch/arm/mach-imx/include/mach/imx6-regs.h | 2 +
3 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index d11957f..994adb8 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -21,10 +21,12 @@
#include <errno.h>
#include <sizes.h>
#include <init.h>
+#include <of.h>
#include <asm/barebox-arm.h>
#include <asm/memory.h>
#include <mach/esdctl.h>
#include <mach/esdctl-v4.h>
+#include <mach/imx6-mmdc.h>
#include <mach/imx1-regs.h>
#include <mach/imx21-regs.h>
#include <mach/imx25-regs.h>
@@ -33,6 +35,7 @@
#include <mach/imx35-regs.h>
#include <mach/imx51-regs.h>
#include <mach/imx53-regs.h>
+#include <mach/imx6-regs.h>
struct imx_esdctl_data {
unsigned long base0;
@@ -163,6 +166,45 @@ static inline unsigned long imx_v4_sdram_size(void __iomem *esdctlbase, int cs)
return size;
}
+/*
+ * MMDC - found on i.MX6
+ */
+
+static inline unsigned long imx6_mmdc_sdram_size(void __iomem *mmdcbase, int cs)
+{
+ u32 ctlval = readl(mmdcbase + MDCTL);
+ u32 mdmisc = readl(mmdcbase + MDMISC);
+ unsigned long size;
+ int rows, cols, width = 2, banks = 8;
+
+ if (cs == 0 && !(ctlval & MMDCx_MDCTL_SDE0))
+ return 0;
+ if (cs == 1 && !(ctlval & MMDCx_MDCTL_SDE1))
+ return 0;
+
+ rows = ((ctlval >> 24) & 0x7) + 11;
+
+ cols = (ctlval >> 20) & 0x7;
+ if (cols == 3)
+ cols = 8;
+ else if (cols == 4)
+ cols = 12;
+ else
+ cols += 9;
+
+ if (ctlval & MMDCx_MDCTL_DSIZ_32B)
+ width = 4;
+ else if (ctlval & MMDCx_MDCTL_DSIZ_64B)
+ width = 8;
+
+ if (mdmisc & MMDCx_MDMISC_DDR_4_BANKS)
+ banks = 4;
+
+ size = (1 << cols) * (1 << rows) * banks * width;
+
+ return size;
+}
+
static void add_mem(unsigned long base0, unsigned long size0,
unsigned long base1, unsigned long size1)
{
@@ -237,6 +279,16 @@ static void imx_esdctl_v4_add_mem(void *esdctlbase, struct imx_esdctl_data *data
data->base1, imx_v4_sdram_size(esdctlbase, 1));
}
+static void imx6_mmdc_add_mem(void *mmdcbase, struct imx_esdctl_data *data)
+{
+ u32 mmdcmisc = readl(mmdcbase + MDMISC);
+ unsigned long base1;
+
+ arm_add_mem_device("ram0", data->base0,
+ imx6_mmdc_sdram_size(mmdcbase, 0) +
+ imx6_mmdc_sdram_size(mmdcbase, 1));
+}
+
static int imx_esdctl_probe(struct device_d *dev)
{
struct imx_esdctl_data *data;
@@ -301,6 +353,11 @@ static __maybe_unused struct imx_esdctl_data imx53_data = {
.add_mem = imx_esdctl_v4_add_mem,
};
+static __maybe_unused struct imx_esdctl_data imx6q_data = {
+ .base0 = MX6_MMDC_PORT0_BASE_ADDR,
+ .add_mem = imx6_mmdc_add_mem,
+};
+
static struct platform_device_id imx_esdctl_ids[] = {
#ifdef CONFIG_ARCH_IMX1
{
@@ -349,10 +406,20 @@ static struct platform_device_id imx_esdctl_ids[] = {
},
};
+static __maybe_unused struct of_device_id imx_esdctl_dt_ids[] = {
+ {
+ .compatible = "fsl,imx6q-mmdc",
+ .data = (unsigned long)&imx6q_data
+ }, {
+ /* sentinel */
+ }
+};
+
static struct driver_d imx_serial_driver = {
.name = "imx-esdctl",
.probe = imx_esdctl_probe,
.id_table = imx_esdctl_ids,
+ .of_compatible = DRV_OF_COMPAT(imx_esdctl_dt_ids),
};
static int imx_esdctl_init(void)
diff --git a/arch/arm/mach-imx/include/mach/imx6-mmdc.h b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
index 3152e16..0017174 100644
--- a/arch/arm/mach-imx/include/mach/imx6-mmdc.h
+++ b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
@@ -30,6 +30,15 @@
#define MPDGHWST2 0x884
#define MPDGHWST3 0x888
+#define MMDCx_MDCTL_SDE0 0x80000000
+#define MMDCx_MDCTL_SDE1 0x40000000
+
+#define MMDCx_MDCTL_DSIZ_16B 0x00000000
+#define MMDCx_MDCTL_DSIZ_32B 0x00010000
+#define MMDCx_MDCTL_DSIZ_64B 0x00020000
+
+#define MMDCx_MDMISC_DDR_4_BANKS 0x00000020
+
#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0 ((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5a8)
#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1 ((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5b0)
#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2 ((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x524)
diff --git a/arch/arm/mach-imx/include/mach/imx6-regs.h b/arch/arm/mach-imx/include/mach/imx6-regs.h
index facbe51..68be43c 100644
--- a/arch/arm/mach-imx/include/mach/imx6-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx6-regs.h
@@ -113,4 +113,6 @@
#define MX6_SATA_BASE_ADDR 0x02200000
+#define MX6_MMDC_PORT0_BASE_ADDR 0x10000000
+
#endif /* __MACH_IMX6_REGS_H */
--
1.7.0.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-04-25 11:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 11:54 [PATCH 1/4] imx6:mmdc: Move register defines to header file Christian Hemp
2014-04-25 11:54 ` Christian Hemp [this message]
2014-04-25 11:54 ` [PATCH 3/4] dts: imx6qdl: add ethernet pin group for mii Christian Hemp
2014-04-25 13:02 ` Lucas Stach
2014-04-25 11:54 ` [PATCH 4/4] imx6: Add support for phyCARD-i.MX6 Christian Hemp
2014-04-25 13:10 ` Alexander Aring
2014-04-25 13:16 ` Lucas Stach
2014-04-25 13:22 ` Alexander Aring
2014-04-28 13:58 ` Christian Hemp
2014-04-28 14:15 ` Sascha Hauer
2014-04-27 6:38 ` Sascha Hauer
2014-04-25 12:54 ` [PATCH 1/4] imx6:mmdc: Move register defines to header file Alexander Aring
2014-04-25 12:57 ` Alexander Aring
2014-04-26 15:00 ` Alexander Aring
2014-04-28 6:10 ` 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=1398426868-30285-2-git-send-email-c.hemp@phytec.de \
--to=c.hemp@phytec.de \
--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