Module Name: src
Committed By: skrll
Date: Fri Jan 17 07:57:42 UTC 2025
Modified Files:
src/sys/arch/riscv/starfive: jh7110_clkc.c
Log Message:
Order the clock controllers consistently. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/starfive/jh7110_clkc.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/riscv/starfive/jh7110_clkc.c
diff -u src/sys/arch/riscv/starfive/jh7110_clkc.c:1.6 src/sys/arch/riscv/starfive/jh7110_clkc.c:1.7
--- src/sys/arch/riscv/starfive/jh7110_clkc.c:1.6 Fri Sep 20 07:29:39 2024
+++ src/sys/arch/riscv/starfive/jh7110_clkc.c Fri Jan 17 07:57:42 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: jh7110_clkc.c,v 1.6 2024/09/20 07:29:39 rin Exp $ */
+/* $NetBSD: jh7110_clkc.c,v 1.7 2025/01/17 07:57:42 skrll Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jh7110_clkc.c,v 1.6 2024/09/20 07:29:39 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jh7110_clkc.c,v 1.7 2025/01/17 07:57:42 skrll Exp $");
#include <sys/param.h>
@@ -816,24 +816,24 @@ struct jh7110_clock_config {
size_t jhcc_nclks;
};
+static struct jh7110_clock_config jh7110_sysclk_config = {
+ .jhcc_clocks = jh7110_sysclk_clocks,
+ .jhcc_nclks = __arraycount(jh7110_sysclk_clocks),
+};
+
static struct jh7110_clock_config jh7110_aonclk_config = {
.jhcc_clocks = jh7110_aonclk_clocks,
.jhcc_nclks = __arraycount(jh7110_aonclk_clocks),
};
-static struct jh7110_clock_config jh7110_ispclk_config = {
- .jhcc_clocks = jh7110_ispclk_clocks,
- .jhcc_nclks = __arraycount(jh7110_ispclk_clocks),
-};
-
static struct jh7110_clock_config jh7110_stgclk_config = {
.jhcc_clocks = jh7110_stgclk_clocks,
.jhcc_nclks = __arraycount(jh7110_stgclk_clocks),
};
-static struct jh7110_clock_config jh7110_sysclk_config = {
- .jhcc_clocks = jh7110_sysclk_clocks,
- .jhcc_nclks = __arraycount(jh7110_sysclk_clocks),
+static struct jh7110_clock_config jh7110_ispclk_config = {
+ .jhcc_clocks = jh7110_ispclk_clocks,
+ .jhcc_nclks = __arraycount(jh7110_ispclk_clocks),
};
static struct jh7110_clock_config jh7110_voutclk_config = {
@@ -921,18 +921,18 @@ static struct jh7110_crg jh7110_aon_conf
.jhc_debug = true,
};
-static struct jh7110_crg jh7110_isp_config = {
- .jhc_name = "Image-Signal-Process",
- .jhc_clk = &jh7110_ispclk_config,
- .jhc_rst = &jh7110_isprst_config,
-};
-
static struct jh7110_crg jh7110_stg_config = {
.jhc_name = "System-Top-Group",
.jhc_clk = &jh7110_stgclk_config,
.jhc_rst = &jh7110_stgrst_config,
};
+static struct jh7110_crg jh7110_isp_config = {
+ .jhc_name = "Image-Signal-Process",
+ .jhc_clk = &jh7110_ispclk_config,
+ .jhc_rst = &jh7110_isprst_config,
+};
+
static struct jh7110_crg jh7110_vout_config = {
.jhc_name = "Video Output",
.jhc_clk = &jh7110_voutclk_config,
@@ -943,8 +943,8 @@ static struct jh7110_crg jh7110_vout_con
static const struct device_compatible_entry compat_data[] = {
{ .compat = "starfive,jh7110-syscrg", .data = &jh7110_sys_config },
{ .compat = "starfive,jh7110-aoncrg", .data = &jh7110_aon_config },
- { .compat = "starfive,jh7110-ispcrg", .data = &jh7110_isp_config },
{ .compat = "starfive,jh7110-stgcrg", .data = &jh7110_stg_config },
+ { .compat = "starfive,jh7110-ispcrg", .data = &jh7110_isp_config },
{ .compat = "starfive,jh7110-voutcrg", .data = &jh7110_vout_config },
DEVICE_COMPAT_EOL
};
