git: 628d2bc313b7 - main - aw_ccu: h6: Allow the IR and W1 clocks to change their parent

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Fri, 13 Nov 2026 07:29:50 UTC
The branch main has been updated by manu:

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

commit 628d2bc313b7eed68461a65585b5161f4fefe713
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-11-13 06:43:43 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2026-11-13 07:29:30 +0000

    aw_ccu: h6: Allow the IR and W1 clocks to change their parent
    
    The IR clock was defined without AW_CLK_REPARENT, so only the current
    parent was used to find a rate.  The firmware leaves the mux on osc32k,
    from which the best rate is 32768Hz, and aw_cir asks for exactly 3MHz,
    which osc24M can give.  The request failed and r_ir did not attach.  Do
    the same as the main CCU for the CIR-TX clock and let the clock use the
    best parent, and do the same for the 1-wire clock which is the same.
    
    Reported by:    llm-postcr
    Fixes:          69919babdac7 ("aw_ccu: h6: Add the IR, W1, RSB and RTC clocks of the R CCU")
    Tested on: H6
---
 sys/dev/clk/allwinner/ccu_h6_r.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/dev/clk/allwinner/ccu_h6_r.c b/sys/dev/clk/allwinner/ccu_h6_r.c
index 6fdc11325330..8631e7331f21 100644
--- a/sys/dev/clk/allwinner/ccu_h6_r.c
+++ b/sys/dev/clk/allwinner/ccu_h6_r.c
@@ -122,7 +122,8 @@ NM_CLK(ir_clk,
     0, 5, 0, 0,					/* m factor */
     24, 1,					/* mux */
     31,						/* gate */
-    AW_CLK_HAS_GATE | AW_CLK_HAS_MUX);		/* flags */
+    AW_CLK_HAS_GATE | AW_CLK_HAS_MUX |
+    AW_CLK_REPARENT);				/* flags */
 
 NM_CLK(w1_clk,
     CLK_W1, "w1", r_mod0_parents,		/* id, name, parents */
@@ -131,7 +132,8 @@ NM_CLK(w1_clk,
     0, 5, 0, 0,					/* m factor */
     24, 1,					/* mux */
     31,						/* gate */
-    AW_CLK_HAS_GATE | AW_CLK_HAS_MUX);		/* flags */
+    AW_CLK_HAS_GATE | AW_CLK_HAS_MUX |
+    AW_CLK_REPARENT);				/* flags */
 
 static struct aw_ccung_clk clks[] = {
 	{ .type = AW_CLK_PREDIV_MUX, .clk.prediv_mux = &ar100_clk},