From 891955b1a714c8177e04838d1ef39b50b3a10f83 Mon Sep 17 00:00:00 2001 From: Bai Ping Date: Sat, 29 Sep 2018 13:49:43 +0800 Subject: MLK-19777-02 imx8mm: rename lpddr4_timing variable to dram_timing. For LPDDR4 and DDR4, we use the same dram_timing struct to config parameters. rename the 'lpddr4_timing' to 'dram_timing' for common use. Signed-off-by: Bai Ping (cherry picked from commit 4e9048d810eb92c395453a28dea2a44961e08948) --- arch/arm/include/asm/arch-imx8m/imx8m_ddr.h | 2 +- board/freescale/imx8mm_evk/lpddr4_timing.c | 2 +- board/freescale/imx8mm_evk/spl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h b/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h index 9ea4d588a4..ec698cfd88 100644 --- a/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h +++ b/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h @@ -48,7 +48,7 @@ struct dram_timing_info { unsigned int ddrphy_pie_num; }; -extern struct dram_timing_info lpddr4_timing; +extern struct dram_timing_info dram_timing; void ddr_load_train_firmware(enum fw_type type); void ddr_init(struct dram_timing_info *timing_info); diff --git a/board/freescale/imx8mm_evk/lpddr4_timing.c b/board/freescale/imx8mm_evk/lpddr4_timing.c index 48cea716ed..61b6b9e2eb 100644 --- a/board/freescale/imx8mm_evk/lpddr4_timing.c +++ b/board/freescale/imx8mm_evk/lpddr4_timing.c @@ -1967,7 +1967,7 @@ struct dram_fsp_msg lpddr4_dram_fsp_msg[] = { }; /* lpddr4 timing config params on EVK board */ -struct dram_timing_info lpddr4_timing = { +struct dram_timing_info dram_timing = { .ddrc_cfg = lpddr4_ddrc_cfg, .ddrc_cfg_num = ARRAY_SIZE(lpddr4_ddrc_cfg), .ddrphy_cfg = lpddr4_ddrphy_cfg, diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c index 244c51eed8..d30fbd5337 100644 --- a/board/freescale/imx8mm_evk/spl.c +++ b/board/freescale/imx8mm_evk/spl.c @@ -31,7 +31,7 @@ void spl_dram_init(void) { #ifdef CONFIG_IMX8M_LPDDR4 /* ddr train */ - ddr_init(&lpddr4_timing); + ddr_init(&dram_timing); #else ddr_init(); #endif -- cgit v1.2.3