Module Name: src
Committed By: jmcneill
Date: Thu Dec 24 12:47:38 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_timer.c
Log Message:
use "watchdog" clock if not defined in fdt
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_timer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_timer.c
diff -u src/sys/arch/arm/nvidia/tegra_timer.c:1.3 src/sys/arch/arm/nvidia/tegra_timer.c:1.4
--- src/sys/arch/arm/nvidia/tegra_timer.c:1.3 Tue Dec 22 22:10:36 2015
+++ src/sys/arch/arm/nvidia/tegra_timer.c Thu Dec 24 12:47:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_timer.c,v 1.3 2015/12/22 22:10:36 jmcneill Exp $ */
+/* $NetBSD: tegra_timer.c,v 1.4 2015/12/24 12:47:38 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_timer.c,v 1.3 2015/12/22 22:10:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_timer.c,v 1.4 2015/12/24 12:47:38 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -95,6 +95,8 @@ tegra_timer_attach(device_t parent, devi
return;
}
sc->sc_clk_watchdog = fdtbus_clock_get(faa->faa_phandle, "watchdog");
+ if (sc->sc_clk_watchdog == NULL)
+ sc->sc_clk_watchdog = clk_get("watchdog");
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
