Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / lib / reset.c

diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 7a0358071ced67b39f7f9f77cf261c827659e276..4f1a768bfe1382e0b0e695e784b2e227dd1bd632 100644 (file)
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -17,19 +18,27 @@
  * mailto:info@wawnet.biz
  *
  * (C) Copyright 2004 Texas Insturments
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <command.h>
+#include <cpu_func.h>
+#include <irq_func.h>
+#include <linux/delay.h>
 
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+__weak void reset_misc(void)
+{
+}
+
+int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        puts ("resetting ...\n");
 
-       udelay (50000);                         /* wait 50 ms */
+       mdelay(50);                             /* wait 50 ms */
 
        disable_interrupts();
+
+       reset_misc();
        reset_cpu(0);
 
        /*NOTREACHED*/