summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJacky Bai <ping.bai@nxp.com>2019-05-24 10:08:05 +0800
committerJacky Bai <ping.bai@nxp.com>2019-05-24 10:30:18 +0800
commitc5dcc21c214badd5b48b48dfaa62d17ba13c6b17 (patch)
treec739aac4aeecc2a458009da145bf61587afd153e /drivers
parent2c5b74872bdc62b02a6e7c5761e27cdaeb677c8d (diff)
MLK-21821 ddr: imx8m: Fix the ddr init hang on imx8mq
On, i.MX8MQ, the PLL config must be done when ddrmix isolation is released. So move the dram pll init after iso config done. For other i.MX8M SOC, either init pll before or after isolation is ok. Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ddr/imx8m/ddr_init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ddr/imx8m/ddr_init.c b/drivers/ddr/imx8m/ddr_init.c
index e99ad05d2d..65d467e8dc 100644
--- a/drivers/ddr/imx8m/ddr_init.c
+++ b/drivers/ddr/imx8m/ddr_init.c
@@ -43,14 +43,14 @@ void ddr_init(struct dram_timing_info *dram_timing)
clock_set_target_val(DRAM_APB_CLK_ROOT, CLK_ROOT_ON | CLK_ROOT_SOURCE_SEL(4) |
CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV4));
- initial_drate = dram_timing->fsp_msg[0].drate;
- /* default to the frequency point 0 clock */
- ddrphy_init_set_dfi_clk(initial_drate);
-
/* disable iso */
reg32_write(0x303A00EC, 0x0000ffff); /* PGC_CPU_MAPPING */
reg32setbit(0x303A00F8, 5); /* PU_PGC_SW_PUP_REQ */
+ initial_drate = dram_timing->fsp_msg[0].drate;
+ /* default to the frequency point 0 clock */
+ ddrphy_init_set_dfi_clk(initial_drate);
+
/* D-aasert the presetn */
reg32_write(SRC_DDRC_RCR_ADDR, 0x8F000006);