From nobody Tue Sep 22 20:17:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hqBGj4SL1z6t1y9 for ; Tue, 22 Sep 2026 20:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hqBGj3f4xz4gtb for ; Tue, 22 Sep 2026 20:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790108253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Egh6YYXJOiJuG9AlfLKQo5Z6JwCwv0Msk8MoYoOKqSk=; b=OBD83h3SGjf6Yjc+jnq2WaEaZ5OBKLJ5+roTCugIK8k8+HqJLhl61O2LJDw9kmCZS99LJS snTbPqFq0fEwzyBLV+7YexbLlDEhzNH87XNtH9F5L4gYCBlnWBgen0/CrmV6yo0r153uMS N+uX6DbpzdEqAZLzb8tzfZoFbB7kqQODF9+jwcm7+tBUwwrdWNx0fz+1Ar+EF/XAYyxnCj uPrn2nyWaZTmJb6phW3BqCSLQoZAvKC646H6W4r3aC+83kRn+Nr1VbpSluLQqoLByMaooC ox5fEjl9LIAdtnV2tdAe+2fjH4t1oRIfkB7c5a4ap9ExveNU488gnnWXSKdFGw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790108253; b=t2Fyz7GE9sG3XtiwEKkZpXqwIuF5IoRSVi6uTFxWm8SeUSSxhcF7UjaE4O10OsCITB0xLr /relPBeqpVrdxklqCbZtR76r0SzIJfGatpnCNOi0qt89NDT+YYf7UcMM6GvRghFFGzEVej JtG72nb3YzaqFriLw6jzi5huUHIxfgqtxw/6lnAR9xc3wi4DQYQl+VHnrov6E/ZbdnbKKC plx1Xn58kMDDYco1OYLjU5K2wQo80oXr+KSEFYOykjm82CqOufL3P3jZMB7vDQIg6bfAbm vkoUN/ooahpPSGvnBESic5jKc+KMZh9uRbw2CDpIGRE75/yjxkP34Dc4SC6YUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790108253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Egh6YYXJOiJuG9AlfLKQo5Z6JwCwv0Msk8MoYoOKqSk=; b=XlS52qgziYG7eVEre5oeFDrrY5f1JDiqNccr0h7SzmKLao3dKjXMiS7ymJNRBRm/Ferbe3 Vm375JZg8fJek+2UvhQvbj6xujj4Vf9Yfsy5EMnJyGtu14Pg9cllMAHzG3uuwX8XO1aFR2 2BHCColliz2kO2tZ5YXxJZve6+Pfiqi6nPY52zyBQQiH3EDOQJSYTtXrehaykniI0cVrAa T1/FNKHHmS2DcKV43yiwn13WXns7C/jUDQMgz5ju8o3XcJ7gIW4OFHGCzN+Z4HKQPNQZUb UzQhaqg8jt7FOKpcTRqcFwJtXpHhnzA2J5r8t/KUj16om9EsPI3MXsW04aS6wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hqBGj2JMRzM55 for ; Tue, 22 Sep 2026 20:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 216d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 20:17:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: b94772d9bcea - main - clk: Fix a few typos in the spacemit CCU driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b94772d9bcea0cb8b9123dc9e7e4440c6a2857d4 Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 20:17:33 +0000 Message-Id: <6ab2e25d.216d5.73a1fb04@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=b94772d9bcea0cb8b9123dc9e7e4440c6a2857d4 commit b94772d9bcea0cb8b9123dc9e7e4440c6a2857d4 Author: Bojan Novković AuthorDate: 2026-09-22 15:15:56 +0000 Commit: Bojan Novković CommitDate: 2026-09-22 20:12:16 +0000 clk: Fix a few typos in the spacemit CCU driver Fixes: dcb10e3add17 Reported by: Bruno Banelli (p_idx typo) --- sys/dev/clk/spacemit/k1_apmu.c | 6 +++--- sys/dev/clk/spacemit/k1_clk.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/clk/spacemit/k1_apmu.c b/sys/dev/clk/spacemit/k1_apmu.c index 8bcecb9bb6a2..375539574285 100644 --- a/sys/dev/clk/spacemit/k1_apmu.c +++ b/sys/dev/clk/spacemit/k1_apmu.c @@ -50,17 +50,17 @@ K1_CLK_GATE(sdh_axi_aclk, CLK_SDH_AXI, K1_SDH0_CLK_RES_CTRL, 4, K1_CLK_DIV_MUX_GATE(sdh0_clk, CLK_SDH0, K1_SDH0_CLK_RES_CTRL, 3, 8, 3, 5, 4, 11, "pll1_d6", "pll1_d4", "pll2_d8", "pll2_d5", - "pll1_d11", "pll1_d11" , "pll1_d13", "pll1_d23"), + "pll1_d11", "pll1_d13", "pll1_d23"), K1_CLK_DIV_MUX_GATE(sdh1_clk, CLK_SDH1, K1_SDH1_CLK_RES_CTRL, 3, 8, 3, 5, 4, 11, "pll1_d6", "pll1_d4", "pll2_d8", "pll2_d5", - "pll1_d11", "pll1_d11" , "pll1_d13", "pll1_d23"), + "pll1_d11", "pll1_d13", "pll1_d23"), K1_CLK_DIV_MUX_GATE(sdh2_clk, CLK_SDH2, K1_SDH2_CLK_RES_CTRL, 3, 8, 3, 5, 4, 11, "pll1_d6", "pll1_d4", "pll2_d8", "pll1_d3", - "pll1_d11", "pll1_d11" , "pll1_d13", "pll1_d23") + "pll1_d11", "pll1_d13", "pll1_d23") }; static const struct k1_reset_def apmu_resets[] = { diff --git a/sys/dev/clk/spacemit/k1_clk.c b/sys/dev/clk/spacemit/k1_clk.c index 3ee1ae66c1b5..63a05355dd32 100644 --- a/sys/dev/clk/spacemit/k1_clk.c +++ b/sys/dev/clk/spacemit/k1_clk.c @@ -338,7 +338,7 @@ k1_clk_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, mux_mask <<= clk_sc->mux_shift; val = READ4(sc, clk_sc->reg); val &= ~mux_mask; - val |= (p_idx << clk_sc->mux_shift); + val |= (best_parent << clk_sc->mux_shift); WRITE4(sc, clk_sc->reg, val); if (k1_clk_send_fc_req(clk) != 0) { @@ -383,7 +383,7 @@ k1_clk_init(struct clknode *clk, device_t dev) sc = device_get_softc(clknode_get_device(clk)); clk_sc = clknode_get_softc(clk); - if (clk_sc->mux_shift == 0) { + if (clk_sc->mux_nbits == 0) { clknode_init_parent_idx(clk, 0); return (0); }