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 f3ea116e8700cb8b15a85708f4d8b096d08c7f3b..4f1a768bfe1382e0b0e695e784b2e227dd1bd632 100644 (file)
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -21,16 +21,20 @@
  */
 
 #include <common.h>
+#include <command.h>
+#include <cpu_func.h>
+#include <irq_func.h>
+#include <linux/delay.h>
 
 __weak void reset_misc(void)
 {
 }
 
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+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();