[src/trunk]: src/sys/arch/arm/sunxi apparently the 'ahb' and 'ths' clocks wer...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d83c20b417bb
branches:  trunk
changeset: 374548:d83c20b417bb
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue May 02 10:18:54 2023 +0000

description:
apparently the 'ahb' and 'ths' clocks were renamed to 'bus' and 'mod' in the
fdt at some point, so look for those as well
with this my pinebook's sensors work again

diffstat:

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

diffs (34 lines):

diff -r ee0da8ac7c4c -r d83c20b417bb sys/arch/arm/sunxi/sunxi_thermal.c
--- a/sys/arch/arm/sunxi/sunxi_thermal.c        Tue May 02 09:49:33 2023 +0000
+++ b/sys/arch/arm/sunxi/sunxi_thermal.c        Tue May 02 10:18:54 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_thermal.c,v 1.14 2021/11/07 17:11:58 jmcneill Exp $ */
+/* $NetBSD: sunxi_thermal.c,v 1.15 2023/05/02 10:18:54 macallan Exp $ */
 
 /*-
  * Copyright (c) 2016-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.14 2021/11/07 17:11:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.15 2023/05/02 10:18:54 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -521,6 +521,7 @@ sunxi_thermal_init_clocks(struct sunxi_t
        int error;
 
        clk = fdtbus_clock_get(sc->phandle, "ahb");
+       if (clk == 0) clk = fdtbus_clock_get(sc->phandle, "bus");
        if (clk) {
                error = clk_enable(clk);
                if (error != 0)
@@ -528,6 +529,7 @@ sunxi_thermal_init_clocks(struct sunxi_t
        }
 
        clk = fdtbus_clock_get(sc->phandle, "ths");
+       if (clk == 0) clk = fdtbus_clock_get(sc->phandle, "mod");
        if (clk) {
                error = clk_set_rate(clk, sc->conf->clk_rate);
                if (error != 0)