summaryrefslogtreecommitdiff
path: root/arch/arm/mach-socfpga/reset_manager.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-20 09:44:05 -0400
committerTom Rini <trini@konsulko.com>2018-05-20 09:44:05 -0400
commit904e546970184d9f5b7e1bde7065b745e67a1bef (patch)
tree5873f1c17c89a7db365841e989dc71e22bf09f75 /arch/arm/mach-socfpga/reset_manager.c
parent855ff8e6dd58b01930d8b8b726e65310d546a0c9 (diff)
parent00f7ae6138ad8b9d859a70d022161297b1bb8049 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/reset_manager.c')
-rw-r--r--arch/arm/mach-socfpga/reset_manager.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/reset_manager.c b/arch/arm/mach-socfpga/reset_manager.c
index 1389c82169b..e0a01ed07a5 100644
--- a/arch/arm/mach-socfpga/reset_manager.c
+++ b/arch/arm/mach-socfpga/reset_manager.c
@@ -8,8 +8,16 @@
#include <asm/io.h>
#include <asm/arch/reset_manager.h>
+#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+#include <asm/arch/mailbox_s10.h>
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#if !defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
static const struct socfpga_reset_manager *reset_manager_base =
(void *)SOCFPGA_RSTMGR_ADDRESS;
+#endif
/*
* Write the reset manager register to cause reset
@@ -17,8 +25,13 @@ static const struct socfpga_reset_manager *reset_manager_base =
void reset_cpu(ulong addr)
{
/* request a warm reset */
+#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+ puts("Mailbox: Issuing mailbox cmd REBOOT_HPS\n");
+ mbox_reset_cold();
+#else
writel(1 << RSTMGR_CTRL_SWWARMRSTREQ_LSB,
&reset_manager_base->ctrl);
+#endif
/*
* infinite loop here as watchdog will trigger and reset
* the processor