diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-12 12:34:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-12 15:42:56 -0400 |
| commit | 066cc7c6cf8bb4fcf2a372e7c19c12fdec0868e7 (patch) | |
| tree | ffbeecd3be2eea15beac51ba3d0a6568808ecefd /drivers/ddr | |
| parent | 40a9546c7b6217a78a3a010a0142529a837e46b6 (diff) | |
| parent | 937cb9d0a671b1df01955edd515ebf4a65e45f85 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Misc dts files sync'ed with Linux version (Chris)
- Orion watchdog fix (Chris)
- kwbimage changed to also support Marvell bin_hdr binary (Chris)
- Add DM support to enable CONFIG_BLK for sata_mv (Stefan)
- Enable BLK on multiple platforms (Stefan)
- Misc minor fixes to AXP theadorable board (Stefan)
- Correct logic for DM_SCSI + unconverted drivers check (stefan)
- Misc changes to kirkwood to enable DM_USB here (Chris)
- Change ahci_mvebu to enable usage on A38x (Baruch)
- Update the kirkwood entry in git-mailrc (Baruch)
- Misc minor improvements (turris, documentation) (Baruch)
- Enhance sata_mv to support Kirkwood as well (Michael)
- Add wdt command (Michael)
- Add Marvell integrated CPUs (MSYS) support with DB-XC3-24G4XG
board support (Chris)
Diffstat (limited to 'drivers/ddr')
| -rw-r--r-- | drivers/ddr/marvell/axp/xor_regs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ddr/marvell/axp/xor_regs.h b/drivers/ddr/marvell/axp/xor_regs.h index db5c4196739..d779e564189 100644 --- a/drivers/ddr/marvell/axp/xor_regs.h +++ b/drivers/ddr/marvell/axp/xor_regs.h @@ -13,7 +13,11 @@ #define XOR_UNIT(chan) ((chan) >> 1) #define XOR_CHAN(chan) ((chan) & 1) +#ifdef CONFIG_ARMADA_MSYS +#define MV_XOR_REGS_OFFSET(unit) (0xF0800) +#else #define MV_XOR_REGS_OFFSET(unit) (0x60900) +#endif #define MV_XOR_REGS_BASE(unit) (MV_XOR_REGS_OFFSET(unit)) /* XOR Engine Control Register Map */ |