Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / drivers / ddr / marvell / axp / xor_regs.h

diff --git a/drivers/ddr/marvell/axp/xor_regs.h b/drivers/ddr/marvell/axp/xor_regs.h
index 884aa155b43b39bfc9fce7691261637703c1f931..d779e564189a68a5ef49ec4cf005aa690843b6d8 100644 (file)
--- a/drivers/ddr/marvell/axp/xor_regs.h
+++ b/drivers/ddr/marvell/axp/xor_regs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) Marvell International Ltd. and its affiliates
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef __XOR_REGS_H
@@ -14,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 */