diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-28 10:24:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-08 17:06:52 +0100 |
| commit | 024912ba32bccb931e994e8929839751fce9097e (patch) | |
| tree | c2528b5593f6ba1476999bd52f719f32f4ab1c8c /arch | |
| parent | 16e251993e7dbd786d463229161e0ba8118fbfbb (diff) | |
| download | barebox-024912ba32bccb931e994e8929839751fce9097e.tar.gz barebox-024912ba32bccb931e994e8929839751fce9097e.tar.xz | |
ARM: i.MX6 esdctl: Add i.MX6ul support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/esdctl.c | 19 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/esdctl.h | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c index 106e648bd3..ffe708f385 100644 --- a/arch/arm/mach-imx/esdctl.c +++ b/arch/arm/mach-imx/esdctl.c @@ -377,6 +377,11 @@ static __maybe_unused struct imx_esdctl_data imx6q_data = { .add_mem = imx6_mmdc_add_mem, }; +static __maybe_unused struct imx_esdctl_data imx6ul_data = { + .base0 = 0x80000000, + .add_mem = imx6_mmdc_add_mem, +}; + static struct platform_device_id imx_esdctl_ids[] = { #ifdef CONFIG_ARCH_IMX1 { @@ -427,6 +432,9 @@ static struct platform_device_id imx_esdctl_ids[] = { static __maybe_unused struct of_device_id imx_esdctl_dt_ids[] = { { + .compatible = "fsl,imx6ul-mmdc", + .data = &imx6ul_data + }, { .compatible = "fsl,imx6q-mmdc", .data = &imx6q_data }, { @@ -589,3 +597,14 @@ void __noreturn imx6q_barebox_entry(void *boarddata) barebox_arm_entry(0x10000000, size, boarddata); } + +void __noreturn imx6ul_barebox_entry(void *boarddata) +{ + u64 size_cs0 = imx6_mmdc_sdram_size((void *)MX6_MMDC_P0_BASE_ADDR, 0); + u64 size_cs1 = imx6_mmdc_sdram_size((void *)MX6_MMDC_P0_BASE_ADDR, 1); + u64 total = size_cs0 + size_cs1; + + resource_size_t size = min(total, (u64)IMX6_MAX_SDRAM_SIZE); + + barebox_arm_entry(0x80000000, size, boarddata); +} diff --git a/arch/arm/mach-imx/include/mach/esdctl.h b/arch/arm/mach-imx/include/mach/esdctl.h index cf8d89d742..66dcc8974c 100644 --- a/arch/arm/mach-imx/include/mach/esdctl.h +++ b/arch/arm/mach-imx/include/mach/esdctl.h @@ -136,6 +136,7 @@ void __noreturn imx35_barebox_entry(void *boarddata); void __noreturn imx51_barebox_entry(void *boarddata); void __noreturn imx53_barebox_entry(void *boarddata); void __noreturn imx6q_barebox_entry(void *boarddata); +void __noreturn imx6ul_barebox_entry(void *boarddata); void imx_esdctl_disable(void); #endif |