diff options
| author | Bai Ping <ping.bai@nxp.com> | 2018-09-29 13:39:24 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-10-10 01:59:14 -0700 |
| commit | 11efa9a0c5e3bef3098ac974d0b036c82692b647 (patch) | |
| tree | d992c9146536f5e5f0a1862f2782991bf31a3340 | |
| parent | 221caa43e79204dba34be7d42b8c7fed104e2e64 (diff) | |
MLK-19777-01: imx8mm: rename the lpddr4_ddrphy_train file
For LPDDR4 or DDR4, the ddr phy train flow is the same.
So rename the 'lpddr4_ddrphy_train.c' to 'ddrphy_train.c'.
make it more common for reuse and move it to driver/ddr/imx8m/.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit 258db72309ec47b99cec89c06f6b4491f9951b27)
| -rw-r--r-- | arch/arm/include/asm/arch-imx8m/imx8m_ddr.h | 2 | ||||
| -rw-r--r-- | drivers/ddr/imx8m/Makefile | 4 | ||||
| -rw-r--r-- | drivers/ddr/imx8m/ddrphy_train.c (renamed from drivers/ddr/imx8m/lpddr4/lpddr4_ddrphy_train.c) | 2 | ||||
| -rw-r--r-- | drivers/ddr/imx8m/lpddr4/Makefile | 7 | ||||
| -rw-r--r-- | drivers/ddr/imx8m/lpddr4_init.c (renamed from drivers/ddr/imx8m/lpddr4/lpddr4_init.c) | 2 |
5 files changed, 5 insertions, 12 deletions
diff --git a/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h b/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h index e5180e85f7..9ea4d588a4 100644 --- a/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h +++ b/arch/arm/include/asm/arch-imx8m/imx8m_ddr.h @@ -52,7 +52,7 @@ extern struct dram_timing_info lpddr4_timing; void ddr_load_train_firmware(enum fw_type type); void ddr_init(struct dram_timing_info *timing_info); -void lpddr4_cfg_phy(struct dram_timing_info *timing_info); +void ddr_cfg_phy(struct dram_timing_info *timing_info); void load_lpddr4_phy_pie(void); void ddrphy_trained_csr_save(struct dram_cfg_param *, unsigned int); void dram_config_save(struct dram_timing_info *, unsigned long); diff --git a/drivers/ddr/imx8m/Makefile b/drivers/ddr/imx8m/Makefile index a90a4e4b5c..9e4a6992a1 100644 --- a/drivers/ddr/imx8m/Makefile +++ b/drivers/ddr/imx8m/Makefile @@ -5,6 +5,6 @@ # ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_IMX8M_DRAM) += helper.o ddrphy_utils.o -obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4/ +obj-$(CONFIG_IMX8M_DRAM) += helper.o ddrphy_utils.o ddrphy_train.o +obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_init.o endif diff --git a/drivers/ddr/imx8m/lpddr4/lpddr4_ddrphy_train.c b/drivers/ddr/imx8m/ddrphy_train.c index 976ccb908c..310099d7c4 100644 --- a/drivers/ddr/imx8m/lpddr4/lpddr4_ddrphy_train.c +++ b/drivers/ddr/imx8m/ddrphy_train.c @@ -8,7 +8,7 @@ #include <asm/arch/imx8m_ddr.h> #include <asm/arch/lpddr4_define.h> -void lpddr4_cfg_phy(struct dram_timing_info *dram_timing) +void ddr_cfg_phy(struct dram_timing_info *dram_timing) { struct dram_cfg_param *dram_cfg; struct dram_fsp_msg *fsp_msg; diff --git a/drivers/ddr/imx8m/lpddr4/Makefile b/drivers/ddr/imx8m/lpddr4/Makefile deleted file mode 100644 index 1710bac652..0000000000 --- a/drivers/ddr/imx8m/lpddr4/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright 2018 NXP -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_SPL_BUILD) += lpddr4_init.o lpddr4_ddrphy_train.o diff --git a/drivers/ddr/imx8m/lpddr4/lpddr4_init.c b/drivers/ddr/imx8m/lpddr4_init.c index d143eeb6b7..ee6a8dc686 100644 --- a/drivers/ddr/imx8m/lpddr4/lpddr4_init.c +++ b/drivers/ddr/imx8m/lpddr4_init.c @@ -103,7 +103,7 @@ void ddr_init(struct dram_timing_info *dram_timing) /* step8 Configure LPDDR4 PHY's registers */ debug("DDRINFO:ddrphy config start\n"); - lpddr4_cfg_phy(dram_timing); + ddr_cfg_phy(dram_timing); debug("DDRINFO: ddrphy config done\n"); /* |