Module Name: src
Committed By: martin
Date: Thu May 4 18:56:36 UTC 2023
Modified Files:
src/sys/arch/arm/sunxi [netbsd-10]: sunxi_thermal.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #156):
sys/arch/arm/sunxi/sunxi_thermal.c: revision 1.15
sys/arch/arm/sunxi/sunxi_thermal.c: revision 1.16
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
Cleanup previous: Try new bindings first, document old with DTCOMPAT, KNF
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/arch/arm/sunxi/sunxi_thermal.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/sunxi/sunxi_thermal.c
diff -u src/sys/arch/arm/sunxi/sunxi_thermal.c:1.14 src/sys/arch/arm/sunxi/sunxi_thermal.c:1.14.4.1
--- src/sys/arch/arm/sunxi/sunxi_thermal.c:1.14 Sun Nov 7 17:11:58 2021
+++ src/sys/arch/arm/sunxi/sunxi_thermal.c Thu May 4 18:56:36 2023
@@ -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.14.4.1 2023/05/04 18:56:36 martin Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -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.14.4.1 2023/05/04 18:56:36 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -520,14 +520,22 @@ sunxi_thermal_init_clocks(struct sunxi_t
struct clk *clk;
int error;
- clk = fdtbus_clock_get(sc->phandle, "ahb");
+ clk = fdtbus_clock_get(sc->phandle, "bus");
+ if (clk == NULL) {
+ /* DTCOMPAT */
+ clk = fdtbus_clock_get(sc->phandle, "ahb");
+ }
if (clk) {
error = clk_enable(clk);
if (error != 0)
return error;
}
- clk = fdtbus_clock_get(sc->phandle, "ths");
+ clk = fdtbus_clock_get(sc->phandle, "mod");
+ if (clk == NULL) {
+ /* DTCOMPAT */
+ clk = fdtbus_clock_get(sc->phandle, "ths");
+ }
if (clk) {
error = clk_set_rate(clk, sc->conf->clk_rate);
if (error != 0)
