Merge tag 'mmc-2019-5-3' of https://github.com/MrVan/u-boot

[oweals/u-boot.git] / arch / mips / mach-mt7620 / cpu.c

diff --git a/arch/mips/mach-mt7620/cpu.c b/arch/mips/mach-mt7620/cpu.c
index 9e0ca716f72bc101a00aeffc30a7c472f405f8c4..fcd0484a6d871685a0e455ecdbbf3687f37c0022 100644 (file)
--- a/arch/mips/mach-mt7620/cpu.c
+++ b/arch/mips/mach-mt7620/cpu.c
@@ -69,28 +69,6 @@ int print_cpuinfo(void)
        return 0;
 }
 
-#ifdef CONFIG_WATCHDOG
-static struct udevice *watchdog_dev;
-
-/* Called by macro WATCHDOG_RESET */
-void watchdog_reset(void)
-{
-       static ulong next_reset;
-       ulong now;
-
-       if (!watchdog_dev)
-               return;
-
-       now = get_timer(0);
-
-       /* Do not reset the watchdog too often */
-       if (now > next_reset) {
-               next_reset = now + 1000;        /* reset every 1000ms */
-               wdt_reset(watchdog_dev);
-       }
-}
-#endif
-
 int arch_misc_init(void)
 {
        /*
@@ -103,19 +81,5 @@ int arch_misc_init(void)
        flush_dcache_range(gd->bd->bi_memstart,
                           gd->bd->bi_memstart + gd->ram_size - 1);
 
-#ifdef CONFIG_WATCHDOG
-       /* Init watchdog */
-       if (uclass_get_device_by_seq(UCLASS_WDT, 0, &watchdog_dev)) {
-               debug("Watchdog: Not found by seq!\n");
-               if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) {
-                       puts("Watchdog: Not found!\n");
-                       return 0;
-               }
-       }
-
-       wdt_start(watchdog_dev, 60000, 0);      /* 60 seconds */
-       printf("Watchdog: Started\n");
-#endif
-
        return 0;
 }