diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-07 22:50:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-07 22:50:41 -0400 |
| commit | bfb5bfa3c58adc2ef5dbd1bb95b79b31e0dc221c (patch) | |
| tree | 21753c7f94144a286584c1f631ad9bde89a1a438 /drivers/ddr/fsl/ctrl_regs.c | |
| parent | 7e58a3a148fb94e9ce09fb48d0ddd75c20ee7df9 (diff) | |
| parent | 123dc510c6e79f0c94718e2e6b5e4074754aa629 (diff) | |
Merge branch '2021-07-07-remove-non-migrated-platforms'
- Remove a large number of platforms that did not migrate to DM_PCI or
DM_USB by 2 years past the migration deadline and do not have a
migration imminent.
Diffstat (limited to 'drivers/ddr/fsl/ctrl_regs.c')
| -rw-r--r-- | drivers/ddr/fsl/ctrl_regs.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index c849ef3a4c7..b5122d1a1c3 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -1863,25 +1863,13 @@ static void set_ddr_data_init(fsl_ddr_cfg_regs_t *ddr) static void set_ddr_sdram_clk_cntl(fsl_ddr_cfg_regs_t *ddr, const memctl_options_t *popts) { - unsigned int clk_adjust; /* Clock adjust */ - unsigned int ss_en = 0; /* Source synchronous enable */ - -#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) - /* Per FSL Application Note: AN2805 */ - ss_en = 1; -#endif - if (fsl_ddr_get_version(0) >= 0x40701) { + if (fsl_ddr_get_version(0) >= 0x40701) /* clk_adjust in 5-bits on T-series and LS-series */ - clk_adjust = (popts->clk_adjust & 0x1F) << 22; - } else { + ddr->ddr_sdram_clk_cntl = (popts->clk_adjust & 0x1F) << 22; + else /* clk_adjust in 4-bits on earlier MPC85xx and P-series */ - clk_adjust = (popts->clk_adjust & 0xF) << 23; - } + ddr->ddr_sdram_clk_cntl = (popts->clk_adjust & 0xF) << 23; - ddr->ddr_sdram_clk_cntl = (0 - | ((ss_en & 0x1) << 31) - | clk_adjust - ); debug("FSLDDR: clk_cntl = 0x%08x\n", ddr->ddr_sdram_clk_cntl); } |