diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-12 08:00:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-12 08:00:39 -0500 |
| commit | ad7e1c7c6e2bde2b369f10984d41d6b1833453fb (patch) | |
| tree | f7bf2fcc1d49c12c45267a4dd9581983445c94d5 /drivers/ddr/marvell/axp/xor.c | |
| parent | 4c8e9361bb3ced3b20e45ee94b3751da1a9ed850 (diff) | |
| parent | 15942805b7efe47e186d8b30ec378666561ad1f9 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Some more updates/sync's to A38x DDR3 code (Marek & Pali)
- marvell/ddr/AXP: Some type fixes found in the LTO work (Marek)
- Espressobin: Enable more options (Pali)
- pci-aardvark: Implement workaround for the readback value of
VEND_ID (Paili)
Diffstat (limited to 'drivers/ddr/marvell/axp/xor.c')
| -rw-r--r-- | drivers/ddr/marvell/axp/xor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ddr/marvell/axp/xor.c b/drivers/ddr/marvell/axp/xor.c index 17bfe6a7bf3..76aea96682c 100644 --- a/drivers/ddr/marvell/axp/xor.c +++ b/drivers/ddr/marvell/axp/xor.c @@ -152,8 +152,8 @@ static int mv_xor_ctrl_set(u32 chan, u32 xor_ctrl) return MV_OK; } -int mv_xor_mem_init(u32 chan, u32 start_ptr, u32 block_size, u32 init_val_high, - u32 init_val_low) +int mv_xor_mem_init(u32 chan, u32 start_ptr, unsigned long long block_size, + u32 init_val_high, u32 init_val_low) { u32 tmp; |