diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-09 08:21:26 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-09 08:21:26 -0400 |
commit | 5fb70639cc5eea60e37e5eaaa7cc145e29527658 (patch) | |
tree | e2b9e1b9054bcfcd8f270bbefdd30cf64ba550f5 /drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | |
parent | 61608f395e7dcb2be6060407a72a1149b046430a (diff) | |
parent | 3078e03516934c016ef3ea15f8bce19df3948dfe (diff) |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Armada 38x DDR3 fixes, enhancements (Chris)
- Armada 38x UTMI PHY SerDes fix (Chris)
- Helios4 update - sync with clearfog (Dennis)
- LaCie Kirkwood board rework - enable DM (Simon)
- net/mvpp2 memory init fix (Sven)
Diffstat (limited to 'drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c')
-rw-r--r-- | drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c index df832ac6dc..58ffb20507 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c @@ -11,7 +11,7 @@ #define VREF_MAX_INDEX 7 #define MAX_VALUE (1024 - 1) #define MIN_VALUE (-MAX_VALUE) -#define GET_RD_SAMPLE_DELAY(data, cs) ((data >> rd_sample_mask[cs]) & 0xf) +#define GET_RD_SAMPLE_DELAY(data, cs) ((data >> rd_sample_mask[cs]) & 0x1f) u32 ca_delay; int ddr3_tip_centr_skip_min_win_check = 0; @@ -91,8 +91,8 @@ int ddr3_tip_write_additional_odt_setting(u32 dev_num, u32 if_id) min_read_sample = read_sample[cs_num]; } - min_read_sample = min_read_sample - 1; - max_read_sample = max_read_sample + 4 + (max_phase + 1) / 2 + 1; + min_read_sample = min_read_sample + 2; + max_read_sample = max_read_sample + 7 + (max_phase + 1) / 2 + 1; if (min_read_sample >= 0xf) min_read_sample = 0xf; if (max_read_sample >= 0x1f) |