Module Name: src
Committed By: jmcneill
Date: Tue May 2 23:08:59 UTC 2023
Modified Files:
src/sys/arch/arm/sunxi: sunxi_thermal.c
Log Message:
Cleanup previous: Try new bindings first, document old with DTCOMPAT, KNF
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 src/sys/arch/arm/sunxi/sunxi_thermal.c:1.16
--- src/sys/arch/arm/sunxi/sunxi_thermal.c:1.15 Tue May 2 10:18:54 2023
+++ src/sys/arch/arm/sunxi/sunxi_thermal.c Tue May 2 23:08:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_thermal.c,v 1.15 2023/05/02 10:18:54 macallan Exp $ */
+/* $NetBSD: sunxi_thermal.c,v 1.16 2023/05/02 23:08:58 jmcneill 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.15 2023/05/02 10:18:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.16 2023/05/02 23:08:58 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -520,16 +520,22 @@ sunxi_thermal_init_clocks(struct sunxi_t
struct clk *clk;
int error;
- clk = fdtbus_clock_get(sc->phandle, "ahb");
- if (clk == 0) clk = fdtbus_clock_get(sc->phandle, "bus");
+ 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");
- if (clk == 0) clk = fdtbus_clock_get(sc->phandle, "mod");
+ 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)
