git: f0bab8a17fda - main - aw_clk: Add the minimum value of the N factor to nmm and np

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Thu, 12 Nov 2026 09:51:29 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=f0bab8a17fdae03902631569ca09f3438cbb53b9

commit f0bab8a17fdae03902631569ca09f3438cbb53b9
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-11-10 15:01:55 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2026-11-12 09:47:29 +0000

    aw_clk: Add the minimum value of the N factor to nmm and np
    
    The AW_CLK_FACTOR_MIN_VALUE flag had no effect on the nmm and np clocks
    as the minimum value of their factors was never copied when registering
    them, and they had no way to set it.
    
    Copy the minimum value of the N factor and add a _nmin argument to
    NMM_CLK() and NP_CLK() to set it.  The existing clocks pass 0 as they
    do not use the flag, so nothing changes for them.
    
    Tested on: H6
---
 sys/dev/clk/allwinner/aw_clk.h     |  6 ++++--
 sys/dev/clk/allwinner/aw_clk_nmm.c |  1 +
 sys/dev/clk/allwinner/aw_clk_np.c  |  1 +
 sys/dev/clk/allwinner/ccu_d1.c     | 16 ++++++++--------
 sys/dev/clk/allwinner/ccu_h6.c     | 20 ++++++++++----------
 sys/dev/clk/allwinner/ccu_h616.c   | 22 +++++++++++-----------
 6 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/sys/dev/clk/allwinner/aw_clk.h b/sys/dev/clk/allwinner/aw_clk.h
index 45598615a58a..d8d6ecd09fd3 100644
--- a/sys/dev/clk/allwinner/aw_clk.h
+++ b/sys/dev/clk/allwinner/aw_clk.h
@@ -446,7 +446,7 @@ aw_clk_factor_get_value(struct aw_clk_factor *factor, uint32_t raw)
 
 #define NMM_CLK(_clkname, _id, _name, _pnames,		\
      _offset,						\
-     _nshift, _nwidth, _nvalue, _nflags,		\
+     _nshift, _nwidth, _nvalue, _nflags, _nmin,	\
     _m0shift, _m0width, _m0value, _m0flags,		\
     _m1shift, _m1width, _m1value, _m1flags,		\
     _gate_shift,					\
@@ -464,6 +464,7 @@ aw_clk_factor_get_value(struct aw_clk_factor *factor, uint32_t raw)
 		.n.width = _nwidth,			\
 		.n.value = _nvalue,			\
 		.n.flags = _nflags,			\
+		.n.min_value = _nmin,			\
 		.m0.shift = _m0shift,			\
 		.m0.width = _m0width,			\
 		.m0.value = _m0value,			\
@@ -480,7 +481,7 @@ aw_clk_factor_get_value(struct aw_clk_factor *factor, uint32_t raw)
 
 #define NP_CLK(_clkname, _id, _name, _pnames,		\
      _offset,						\
-     _nshift, _nwidth, _nvalue, _nflags,		\
+     _nshift, _nwidth, _nvalue, _nflags, _nmin,	\
      _pshift, _pwidth, _pvalue, _pflags,		\
     _gate_shift,					\
     _lock, _lock_retries,				\
@@ -497,6 +498,7 @@ aw_clk_factor_get_value(struct aw_clk_factor *factor, uint32_t raw)
 		.n.width = _nwidth,			\
 		.n.value = _nvalue,			\
 		.n.flags = _nflags,			\
+		.n.min_value = _nmin,			\
 		.p.shift = _pshift,			\
 		.p.width = _pwidth,			\
 		.p.value = _pvalue,			\
diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c
index 702cf474b9b7..679a252ea684 100644
--- a/sys/dev/clk/allwinner/aw_clk_nmm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nmm.c
@@ -252,6 +252,7 @@ aw_clk_nmm_register(struct clkdom *clkdom, struct aw_clk_nmm_def *clkdef)
 	sc->n.mask = ((1 << sc->n.width) - 1) << sc->n.shift;
 	sc->n.value = clkdef->n.value;
 	sc->n.flags = clkdef->n.flags;
+	sc->n.min_value = clkdef->n.min_value;
 
 	sc->m0.shift = clkdef->m0.shift;
 	sc->m0.width = clkdef->m0.width;
diff --git a/sys/dev/clk/allwinner/aw_clk_np.c b/sys/dev/clk/allwinner/aw_clk_np.c
index fce371e0e600..9110a8ebe87a 100644
--- a/sys/dev/clk/allwinner/aw_clk_np.c
+++ b/sys/dev/clk/allwinner/aw_clk_np.c
@@ -240,6 +240,7 @@ aw_clk_np_register(struct clkdom *clkdom, struct aw_clk_np_def *clkdef)
 	sc->n.mask = ((1 << sc->n.width) - 1) << sc->n.shift;
 	sc->n.value = clkdef->n.value;
 	sc->n.flags = clkdef->n.flags;
+	sc->n.min_value = clkdef->n.min_value;
 
 	sc->p.shift = clkdef->p.shift;
 	sc->p.width = clkdef->p.width;
diff --git a/sys/dev/clk/allwinner/ccu_d1.c b/sys/dev/clk/allwinner/ccu_d1.c
index 29fa3c9e5bd5..cb9137976e69 100644
--- a/sys/dev/clk/allwinner/ccu_d1.c
+++ b/sys/dev/clk/allwinner/ccu_d1.c
@@ -200,7 +200,7 @@ NP_CLK(pll_cpux_clk,
     "pll_cpux",					/* name */
     pll_cpux_parents,				/* parents */
     0x0,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 2, 0, 0,					/* p factor */
     27,						/* gate */
     28, 1000,					/* lock */
@@ -212,7 +212,7 @@ NMM_CLK(pll_ddr0_clk,
     "pll_ddr0",					/* name */
      pll_ddr0_parents,				/* parents */
     0x10,					/* offset */
-    8, 7, 0, 0,					/* n factor */
+    8, 7, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     27,						/* gate */
@@ -226,7 +226,7 @@ NMM_CLK(pll_periph0_4x_clk,
     "pll_periph0_4x",				/* name */
     pll_periph0_4x_parents,			/* parents */
     0x20,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     27,						/* gate */
@@ -275,7 +275,7 @@ NP_CLK(pll_video0_clk,
     "pll_video0",				/* name */
     pll_video0_parents,				/* parents */
     0x40,					/* offset */
-    8, 7, 0, 0,					/* n factor */
+    8, 7, 0, 0, 0,				/* n factor */
     1, 1, 0, 0,					/* p factor */
     27,						/* gate */
     28, 1000,					/* lock */
@@ -312,7 +312,7 @@ NP_CLK(pll_video1_clk,
     "pll_video1", 				/* name */
     pll_video1_parents,				/* parents */
     0x48,					/* offset */
-    8, 7, 0, 0,					/* n factor */
+    8, 7, 0, 0, 0,				/* n factor */
     1, 1, 0, 0,					/* p factor */
     27,						/* gate */
     28, 1000,					/* lock */
@@ -348,7 +348,7 @@ NMM_CLK(pll_ve_clk,
     "pll_ve",					/* name */
     pll_ve_parents,				/* parents */
     0x58,					/* offset */
-    8, 7, 0, 0,					/* n factor */
+    8, 7, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     27,						/* gate */
@@ -362,7 +362,7 @@ NMM_CLK(pll_audio0_4x_clk,
     "pll_audio0_4x",				/* name */
     pll_audio0_4x_parents,			/* parents */
     0x78,					/* offset */
-    8, 7, 0, 0,					/* n factor */
+    8, 7, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     27,						/* gate */
@@ -398,7 +398,7 @@ NP_CLK(pll_audio1_clk,
     "pll_audio1", 				/* name */
     pll_audio1_parents,				/* parents */
     0x80,					/* offset */
-    8, 7, 0, 0,					/* n factor */
+    8, 7, 0, 0, 0,				/* n factor */
     1, 1, 0, 0,					/* p factor */
     27,						/* gate */
     28, 1000,					/* lock */
diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c
index c1f947ae75af..51477d6e5b0e 100644
--- a/sys/dev/clk/allwinner/ccu_h6.c
+++ b/sys/dev/clk/allwinner/ccu_h6.c
@@ -173,7 +173,7 @@ NP_CLK(pll_cpux_clk,
     CLK_PLL_CPUX,				/* id */
     "pll_cpux", pll_cpux_parents,		/* name, parents */
     0x00,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 2, 0, 0,					/* p factor */
     31,						/* gate */
     28, 1000,					/* lock */
@@ -184,7 +184,7 @@ NMM_CLK(pll_ddr0_clk,
     CLK_PLL_DDR0,				/* id */
     "pll_ddr0", pll_ddr0_parents,		/* name, parents */
     0x10,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -196,7 +196,7 @@ NMM_CLK(pll_peri0_4x_clk,
     CLK_PLL_PERIPH0_4X,				/* id */
     "pll_periph0_4x", pll_peri0_4x_parents,	/* name, parents */
     0x20,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -226,7 +226,7 @@ NMM_CLK(pll_peri1_4x_clk,
     CLK_PLL_PERIPH1_4X,				/* id */
     "pll_periph1_4x", pll_peri1_4x_parents,	/* name, parents */
     0x28,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -256,7 +256,7 @@ NMM_CLK(pll_gpu_clk,
     CLK_PLL_GPU,				/* id */
     "pll_gpu", pll_gpu_parents,			/* name, parents */
     0x30,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -268,7 +268,7 @@ NMM_CLK(pll_video0_4x_clk,
     CLK_PLL_VIDEO0_4X,				/* id */
     "pll_video0_4x", pll_video0_4x_parents,	/* name, parents */
     0x40,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -289,7 +289,7 @@ NMM_CLK(pll_video1_4x_clk,
     CLK_PLL_VIDEO1_4X,				/* id */
     "pll_video1_4x", pll_video1_4x_parents,	/* name, parents */
     0x48,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -310,7 +310,7 @@ NMM_CLK(pll_ve_clk,
     CLK_PLL_VE,					/* id */
     "pll_ve", pll_ve_parents,			/* name, parents */
     0x58,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -322,7 +322,7 @@ NMM_CLK(pll_de_clk,
     CLK_PLL_DE,					/* id */
     "pll_de", pll_de_parents,			/* name, parents */
     0x60,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -334,7 +334,7 @@ NMM_CLK(pll_hsic_clk,
     CLK_PLL_HSIC,				/* id */
     "pll_hsic", pll_hsic_parents,		/* name, parents */
     0x70,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
diff --git a/sys/dev/clk/allwinner/ccu_h616.c b/sys/dev/clk/allwinner/ccu_h616.c
index ea112fbf8ea4..b6d5c5024562 100644
--- a/sys/dev/clk/allwinner/ccu_h616.c
+++ b/sys/dev/clk/allwinner/ccu_h616.c
@@ -168,7 +168,7 @@ NP_CLK(pll_cpux_clk,
     CLK_PLL_CPUX,				/* id */
     "pll_cpux", pll_cpux_parents,		/* name, parents */
     0x00,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     16, 2, 0, 0,				/* p factor */
     31,						/* gate */
     28, 1000,					/* lock */
@@ -179,7 +179,7 @@ NMM_CLK(pll_ddr0_clk,
     CLK_PLL_DDR0,				/* id */
     "pll_ddr0", pll_ddr0_parents,		/* name, parents */
     0x10,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -191,7 +191,7 @@ NMM_CLK(pll_ddr1_clk,
     CLK_PLL_DDR1,				/* id */
     "pll_ddr1", pll_ddr1_parents,		/* name, parents */
     0x18,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -203,7 +203,7 @@ NMM_CLK(pll_peri0_2x_clk,
     CLK_PLL_PERIPH0_2X,				/* id */
     "pll_periph0_2x", pll_peri0_2x_parents,	/* name, parents */
     0x20,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -224,7 +224,7 @@ NMM_CLK(pll_peri1_2x_clk,
     CLK_PLL_PERIPH1_2X,				/* id */
     "pll_periph1_2x", pll_peri1_2x_parents,	/* name, parents */
     0x28,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -245,7 +245,7 @@ NMM_CLK(pll_gpu_clk,
     CLK_PLL_GPU,				/* id */
     "pll_gpu", pll_gpu_parents,			/* name, parents */
     0x30,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -257,7 +257,7 @@ NMM_CLK(pll_video0_4x_clk,
     CLK_PLL_VIDEO0_4X,				/* id */
     "pll_video0_4x", pll_video0_4x_parents,	/* name, parents */
     0x40,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -278,7 +278,7 @@ NMM_CLK(pll_video1_4x_clk,
     CLK_PLL_VIDEO1_4X,				/* id */
     "pll_video1_4x", pll_video1_4x_parents,	/* name, parents */
     0x48,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -299,7 +299,7 @@ NMM_CLK(pll_video2_4x_clk,
     CLK_PLL_VIDEO1_4X,				/* id */
     "pll_video2_4x", pll_video2_4x_parents,	/* name, parents */
     0x50,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -320,7 +320,7 @@ NMM_CLK(pll_ve_clk,
     CLK_PLL_VE,					/* id */
     "pll_ve", pll_ve_parents,			/* name, parents */
     0x58,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */
@@ -332,7 +332,7 @@ NMM_CLK(pll_de_clk,
     CLK_PLL_DE,					/* id */
     "pll_de", pll_de_parents,			/* name, parents */
     0x60,					/* offset */
-    8, 8, 0, 0,					/* n factor */
+    8, 8, 0, 0, 0,				/* n factor */
     0, 1, 0, 0,					/* m0 factor */
     1, 1, 0, 0,					/* m1 factor */
     31,						/* gate */