From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Roese Date: Mon, 17 Aug 2015 09:41:26 +0200 Subject: [U-Boot] [PATCH 7/9] imx: mx6: ddr init MMDC according to ddr_type In-Reply-To: <20150817062520.GA1835@shlinux2> References: <1439782166-9211-1-git-send-email-Peng.Fan@freescale.com> <1439782166-9211-8-git-send-email-Peng.Fan@freescale.com> <55D18521.70301@denx.de> <20150817055952.GA27414@shlinux2> <55D18B2F.7040105@denx.de> <20150817062520.GA1835@shlinux2> Message-ID: <55D19026.9050401@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 17.08.2015 08:25, Peng Fan wrote: > On Mon, Aug 17, 2015 at 09:20:15AM +0200, Stefan Roese wrote: >> On 17.08.2015 07:59, Peng Fan wrote: >>> On Mon, Aug 17, 2015 at 08:54:25AM +0200, Stefan Roese wrote: >>>> On 17.08.2015 05:29, Peng Fan wrote: >>>>> To i.MX6, DDR3 and LPDDR2 is supported, so rename function mx6_dram_cfg >>>>> to mx6_ddr3_cfg and the original mx6_dram_cfg function only is a wrapper. >>>>> The new reimplemented function mx6_dram_cfg only invokes mx6_ddr3_cfg >>>>> when ddr_type is for DDR3. Later we can use ddr_type to initialize >>>>> MMDC for LPDDR2. >>>>> Initialize ddr_type for different boards which enable SPL. >>>>> >>>>> Signed-off-by: Peng Fan >>>>> Cc: Stefano Babic >>>>> Cc: Tim Harvey >>>>> Cc: Stefan Roese >>>>> Cc: Fabio Estevam >>>>> --- >>>>> arch/arm/cpu/armv7/mx6/ddr.c | 14 +++++++++++++- >>>>> arch/arm/include/asm/arch-mx6/mx6-ddr.h | 2 +- >>>>> board/barco/platinum/spl_picon.c | 1 + >>>>> board/barco/platinum/spl_titanium.c | 1 + >>>>> board/freescale/mx6sabresd/mx6sabresd.c | 1 + >>>>> board/freescale/mx6sxsabresd/mx6sxsabresd.c | 1 + >>>>> board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 1 + >>>>> board/gateworks/gw_ventana/gw_ventana_spl.c | 1 + >>>>> board/solidrun/mx6cuboxi/mx6cuboxi.c | 1 + >>>>> 9 files changed, 21 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/arch/arm/cpu/armv7/mx6/ddr.c b/arch/arm/cpu/armv7/mx6/ddr.c >>>>> index 3f23abf..a6bef60 100644 >>>>> --- a/arch/arm/cpu/armv7/mx6/ddr.c >>>>> +++ b/arch/arm/cpu/armv7/mx6/ddr.c >>>>> @@ -348,7 +348,7 @@ void mx6sdl_dram_iocfg(unsigned width, >>>>> mmdc1->entry = value; \ >>>>> } while (0) >>>>> >>>>> -void mx6_dram_cfg(const struct mx6_ddr_sysinfo *sysinfo, >>>>> +void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, >>>>> const struct mx6_mmdc_calibration *calib, >>>>> const struct mx6_ddr3_cfg *ddr3_cfg) >>>>> { >>>>> @@ -655,3 +655,15 @@ void mx6_dram_cfg(const struct mx6_ddr_sysinfo *sysinfo, >>>>> /* wait for auto-ZQ calibration to complete */ >>>>> mdelay(1); >>>>> } >>>>> + >>>>> +void mx6_dram_cfg(const struct mx6_ddr_sysinfo *sysinfo, >>>>> + const struct mx6_mmdc_calibration *calib, >>>>> + const void *ddr_cfg) >>>>> +{ >>>>> + if (sysinfo->ddr_type == 0) { >>>>> + mx6_ddr3_cfg(sysinfo, calib, ddr_cfg); >>>>> + } else { >>>>> + puts("Unsupported ddr type\n"); >>>>> + hang(); >>>>> + } >>>>> +} >>>>> diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h >>>>> index 49fc9e5..e3ba140 100644 >>>>> --- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h >>>>> +++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h >>>>> @@ -439,7 +439,7 @@ void mx6sl_dram_iocfg(unsigned width, >>>>> /* configure mx6 mmdc registers */ >>>>> void mx6_dram_cfg(const struct mx6_ddr_sysinfo *, >>>>> const struct mx6_mmdc_calibration *, >>>>> - const struct mx6_ddr3_cfg *); >>>>> + const void *); >>>>> >>>>> #endif /* CONFIG_SPL_BUILD */ >>>>> >>>>> diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c >>>>> index f421c21..aac0948 100644 >>>>> --- a/board/barco/platinum/spl_picon.c >>>>> +++ b/board/barco/platinum/spl_picon.c >>>>> @@ -137,6 +137,7 @@ static void spl_dram_init(int width) >>>>> .bi_on = 1, /* Bank interleaving enabled */ >>>>> .sde_to_rst = 0x10, /* 14 cycles, 200us (JEDEC default) */ >>>>> .rst_to_cke = 0x23, /* 33 cycles, 500us (JEDEC default) */ >>>>> + .ddr_type = 0, /* DDR3 */ >>>> >>> >>> Seems my patches are not posted to uboot mailist successfully. >> >> The list was stuck over the weekend. Please wait a bit. The messages >> start to arrive now. > > Seems my patch are dropped, not sure :( > >> >>>> Perhaps adding an enum here would be better. You could remove the >>>> comment then as well. >>>> >>>> Other than this: >>>> >>>> Reviewed-by: Stefan Roese >>> >>> Will add your tag, and repost patch set to uboot mailist. >> >> And please add the enum as well. > > How about using macros? saying "#define MX6_DDR3 0" and "#define MX6_LPDDR2 1"? I think enums are here more appropriate. As we don't really care about the value. So something like this: enum { DDR_TYPE_DDR3, DDR_TYPE_LPDDR2, ... }; Thanks, Stefan