diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-15 16:44:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-15 16:44:18 -0500 |
| commit | 8e9801c283c0e5a7ccd5c04f5ba09003d01f1591 (patch) | |
| tree | ae79033993ae3f06b581a3bd0fcd8dc36a3528eb /arch/arm/mach-imx/mx6/ddr.c | |
| parent | a970ee22578dce3d7596280351d3dbade561ed8c (diff) | |
| parent | 9587b0d61133c025d48ebf480aa021fc2fdd53a7 (diff) | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/mach-imx/mx6/ddr.c')
| -rw-r--r-- | arch/arm/mach-imx/mx6/ddr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c index 52a9a259040..39dbd2f6072 100644 --- a/arch/arm/mach-imx/mx6/ddr.c +++ b/arch/arm/mach-imx/mx6/ddr.c @@ -908,7 +908,7 @@ void mx6sdl_dram_iocfg(unsigned width, #define MR(val, ba, cmd, cs1) \ ((val << 16) | (1 << 15) | (cmd << 4) | (cs1 << 3) | ba) #define MMDC1(entry, value) do { \ - if (!is_mx6sx() && !is_mx6ul() && !is_mx6sl()) \ + if (!is_mx6sx() && !is_mx6ul() && !is_mx6ull() && !is_mx6sl()) \ mmdc1->entry = value; \ } while (0) @@ -1215,7 +1215,7 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, u16 mem_speed = ddr3_cfg->mem_speed; mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR; - if (!is_mx6sx() && !is_mx6ul() && !is_mx6sl()) + if (!is_mx6sx() && !is_mx6ul() && !is_mx6ull() && !is_mx6sl()) mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR; /* Limit mem_speed for MX6D/MX6Q */ |