diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-22 12:14:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-22 12:14:27 -0400 |
| commit | 55926ddd189546742a4496e6690c2b62958cd7cd (patch) | |
| tree | 737b2eb33d373333dafdcaa6d8a55c14e13f7667 /drivers/ddr/fsl/options.c | |
| parent | a119357c43a4d4bd0e488a701255bcfea8f8bf6c (diff) | |
| parent | 6dedcedd6442295428ea7f02b0d30739499858a2 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/ddr/fsl/options.c')
| -rw-r--r-- | drivers/ddr/fsl/options.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c index 791d6441010..d0075ff1fd2 100644 --- a/drivers/ddr/fsl/options.c +++ b/drivers/ddr/fsl/options.c @@ -1002,8 +1002,19 @@ unsigned int populate_memctl_options(const common_timing_params_t *common_dimm, popts->twot_en = 0; popts->threet_en = 0; - /* for RDIMM, address parity enable */ - popts->ap_en = 1; + /* for RDIMM and DDR4 UDIMM/discrete memory, address parity enable */ + if (popts->registered_dimm_en) + popts->ap_en = 1; /* 0 = disable, 1 = enable */ + else + popts->ap_en = 0; /* disabled for DDR4 UDIMM/discrete default */ + + if (hwconfig_sub_f("fsl_ddr", "parity", buf)) { + if (hwconfig_subarg_cmp_f("fsl_ddr", "parity", "on", buf)) { + if (popts->registered_dimm_en || + (CONFIG_FSL_SDRAM_TYPE == SDRAM_TYPE_DDR4)) + popts->ap_en = 1; + } + } /* * BSTTOPRE precharge interval |