Index: sys/arm/mv/timer.c =================================================================== --- sys/arm/mv/timer.c +++ sys/arm/mv/timer.c @@ -72,6 +72,7 @@ bus_space_handle_t timer_bsh; struct mtx timer_mtx; struct eventtimer et; + int has_wdt; }; static struct resource_spec mv_timer_spec[] = { @@ -155,9 +156,15 @@ sc->timer_bst = rman_get_bustag(sc->timer_res[0]); sc->timer_bsh = rman_get_bushandle(sc->timer_res[0]); + sc->has_wdt = ofw_bus_has_prop(dev, "mrvl,has-wdt") || + ofw_bus_is_compatible(dev, "marvell,armada-380-wdt"); + mtx_init(&timer_softc->timer_mtx, "watchdog", NULL, MTX_DEF); - mv_watchdog_disable(); - EVENTHANDLER_REGISTER(watchdog_list, mv_watchdog_event, sc, 0); + + if (sc->has_wdt) { + mv_watchdog_disable(); + EVENTHANDLER_REGISTER(watchdog_list, mv_watchdog_event, sc, 0); + } if (ofw_bus_is_compatible(dev, "marvell,armada-380-wdt")) { /* Don't set timers for wdt-only entry. */