diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-17 11:03:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-17 11:03:50 -0500 |
| commit | 8ad1c9c26f7740806a162818b790d4a72f515b7e (patch) | |
| tree | c330b8a446148b86d530de7f688b4fc910beeda8 /drivers/ddr/marvell/a38x/ddr3_training_centralization.c | |
| parent | b6277189398a166011ce46a63665423a20de0809 (diff) | |
| parent | 4b7db75616712606fd6b61a13df38326e41b3301 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- a37xx: pci: Cleanup and minor fix for root port check (Pali)
- pci: mvebu: Ensure that root port is always on root zero bus (Pali)
- kwbimage: Fix dumping DATA registers for v0 images (Pali)
- kwbimage: Support for parsing extended v0 format (Pali)
- a37xx: Fix code and update DTS files to upstream version (Pali)
- a37xx: Fix and extend building memory map (Pali)
- ddr: marvell: a38x: fix BYTE_HOMOGENEOUS_SPLIT_OUT decision (Marek)
- mvebu: Optionally reset board on DDR training failure (Marek)
Diffstat (limited to 'drivers/ddr/marvell/a38x/ddr3_training_centralization.c')
| -rw-r--r-- | drivers/ddr/marvell/a38x/ddr3_training_centralization.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_centralization.c b/drivers/ddr/marvell/a38x/ddr3_training_centralization.c index 42308b6965d..be9f985f22f 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_centralization.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_centralization.c @@ -180,7 +180,8 @@ static int ddr3_tip_centralization(u32 dev_num, u32 mode) [bit_id], EDGE_1); if (current_byte_status & - BYTE_SPLIT_OUT_MIX) { + (BYTE_SPLIT_OUT_MIX | + BYTE_HOMOGENEOUS_SPLIT_OUT)) { if (cur_start_win[bit_id] >= 64) cur_start_win[bit_id] -= 64; else @@ -197,7 +198,8 @@ static int ddr3_tip_centralization(u32 dev_num, u32 mode) EDGE_1); if (cur_end_win[bit_id] >= 64 && (current_byte_status & - BYTE_SPLIT_OUT_MIX)) { + (BYTE_SPLIT_OUT_MIX | + BYTE_HOMOGENEOUS_SPLIT_OUT))) { cur_end_win[bit_id] -= 64; DEBUG_CENTRALIZATION_ENGINE (DEBUG_LEVEL_INFO, |