Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/nvidia use "watchdog" clock if not defined in fdt



details:   https://anonhg.NetBSD.org/src/rev/18157be8872b
branches:  trunk
changeset: 342485:18157be8872b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Dec 24 12:47:38 2015 +0000

description:
use "watchdog" clock if not defined in fdt

diffstat:

 sys/arch/arm/nvidia/tegra_timer.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r babf9ef6c789 -r 18157be8872b sys/arch/arm/nvidia/tegra_timer.c
--- a/sys/arch/arm/nvidia/tegra_timer.c Thu Dec 24 04:16:00 2015 +0000
+++ b/sys/arch/arm/nvidia/tegra_timer.c Thu Dec 24 12:47:38 2015 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
                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;



Home | Main Index | Thread Index | Old Index