From nobody Thu Nov 12 09:51:46 2026 X-Original-To: dev-commits-src-all@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 4jQFz658Fhz70KHg for ; Thu, 12 Nov 2026 09:51:46 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQFz61rXlz3GcQ for ; Thu, 12 Nov 2026 09:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477106; 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=d3m4qvmMc8fRaFLNvEjonX/yqWKS7mfKdO8ry77BxP4=; b=eHqmGDWgUBl2v88GYnf/FpNTaER0oPZdQfGgpgSIHa0V/LzAGTjJy9EU8IVvEdUrILVgkw ZVS1fjXgxYvT0dgcKF4+4ulpvO6E7CErA2dxMnuKgnLO7edRn/hYy/U0YjSbvL4OScdQKA fjQjEPihp8Dy7FYJv+1I+uWIN6ZYq8wn2VmtrQWfUUSU7gdBC/vw02JOIATzMsZitEmioG ELulK89qnB1TlFLeT3WYP65/ffZHDi36H86hmalk78rQU7Kp+zUWyMsOguMsNv31L5ZMrP kgbsr8rVGT4i9YD+S1pxaZ3AQD4wJS0IRW2UGxAq2ox/DrUvpWxMAGDvQPVzXg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794477106; b=Yw2UYyZVme8xD2IqeHi6LcYeZMjHrUpvx0EmejJ3LVvinFnZpJLgc4JkG8kf0p0r/IzUxM eL5PD9N7pY+omRJIoG8BYpvAJZ1igg3mCsQRsUCRe1dXPqkTX+4Uq+1/+TX7QmIula7r7Y 5Be3gkJ1MGlEx90hPJwb5/2fXVQs191wz02lu4IHSzD7c7h6mWyt6/LuWM277JpELKFEQ4 nmkudTY1J9/yUQSVOFZ5G2FJqLWSeqm83XM760tluWmAiMD1Ij16CFCseQEiGFWYCqRsuH yysLhtUIKHvu0tMbuqpjBzTXUEXetu5be5Lmf7MfC4kDlGf5natP8Y4CR5A2Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477106; 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=d3m4qvmMc8fRaFLNvEjonX/yqWKS7mfKdO8ry77BxP4=; b=rFI/7zCPTZmD/kjFG6BhzZCwXRib3CicsJsCUlgc6e/E276XxMUrr92clYpZEJLgowOfcY B/g6X8zlwZTfKsft455LebKLX9ebc6aWc4ZdbreqfsGmYJ/SqhTM5zlkC8lLevzDSdhiHJ XFBsAfJUSR2TsqeuHfRHZ+mF3Icc97pAWKvw+5bXNh/TjZHpT6k4Xc6doH8RrGMP4uo6ys kJy/Gt506i3ijox8R8tyYPbTfWkvnh5TFWY8dIDBAELx/FcztCv+kmNPQHXSSpXzaosURe cuXFlNLzE1foXSMaV5gtYLvvNWO5BdogLktiyhy5d5WH/6sMHOhdwuYhweme+g== 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 4jQFz616ctzxg7 for ; Thu, 12 Nov 2026 09:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f9ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:51:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 333b4fd24578 - main - aw_ccu: h6: Add the CSI clocks List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 333b4fd2457839f019942c59e69acbf9ea4cc7e8 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:51:46 +0000 Message-Id: <6af58c32.1f9ca.18ada955@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=333b4fd2457839f019942c59e69acbf9ea4cc7e8 commit 333b4fd2457839f019942c59e69acbf9ea4cc7e8 Author: Emmanuel Vadot AuthorDate: 2026-11-10 17:29:40 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-12 09:47:32 +0000 aw_ccu: h6: Add the CSI clocks Add the CCI gate, the TOP and MCLK clocks, and the bus gate and reset of the CSI. The mux of the TOP clock has no parent for the value 1. Tested on: H6 --- sys/dev/clk/allwinner/ccu_h6.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c index 2a9d7895d8c5..9d72d4331cb8 100644 --- a/sys/dev/clk/allwinner/ccu_h6.c +++ b/sys/dev/clk/allwinner/ccu_h6.c @@ -205,6 +205,9 @@ static struct aw_ccung_reset h6_ccu_resets[] = { /* TCON_TV_BGR_REG */ CCU_RESET(RST_BUS_TCON_TV0, 0xb9c, 16) + /* CSI_BGR_REG */ + CCU_RESET(RST_BUS_CSI, 0xc2c, 16) + /* HDMI_HDCP_BGR_REG */ CCU_RESET(RST_BUS_HDCP, 0xc4c, 16) }; @@ -353,6 +356,12 @@ static struct aw_ccung_gate h6_ccu_gates[] = { /* TCON_TV_BGR_REG */ CCU_GATE(CLK_BUS_TCON_TV0, "bus-tcon-tv0", "ahb3", 0xb9c, 0) + /* CSI_MISC_CLK_REG */ + CCU_GATE(CLK_CSI_CCI, "csi-cci", "osc24M", 0xc00, 0) + + /* CSI_BGR_REG */ + CCU_GATE(CLK_BUS_CSI, "bus-csi", "ahb3", 0xc2c, 0) + /* HDMI_HDCP_BGR_REG */ CCU_GATE(CLK_BUS_HDCP, "bus-hdcp", "ahb3", 0xc4c, 0) }; @@ -872,6 +881,26 @@ M_CLK(pcie_aux_clk, 31, /* gate */ AW_CLK_HAS_GATE); /* flags */ +static const char *csi_top_parents[] = {"pll_video0", NULL, "pll_ve", + "pll_periph0"}; +M_CLK(csi_top_clk, + CLK_CSI_TOP, "csi-top", csi_top_parents, /* id, name, parents */ + 0xc04, /* offset */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +static const char *csi_mclk_parents[] = {"osc24M", "pll_video0", "pll_periph0", + "pll_periph1"}; +M_CLK(csi_mclk_clk, + CLK_CSI_MCLK, "csi-mclk", csi_mclk_parents, /* id, name, parents */ + 0xc08, /* offset */ + 0, 5, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + static struct aw_ccung_clk h6_ccu_clks[] = { { .type = AW_CLK_NP, .clk.np = &pll_cpux_clk}, { .type = AW_CLK_NMM, .clk.nmm = &pll_ddr0_clk}, @@ -919,6 +948,9 @@ static struct aw_ccung_clk h6_ccu_clks[] = { { .type = AW_CLK_NM, .clk.nm = &tcon_tv0_clk}, { .type = AW_CLK_M, .clk.m = &hdcp_clk}, + { .type = AW_CLK_M, .clk.m = &csi_top_clk}, + { .type = AW_CLK_M, .clk.m = &csi_mclk_clk}, + { .type = AW_CLK_NM, .clk.nm = &mmc0_clk}, { .type = AW_CLK_NM, .clk.nm = &mmc1_clk}, { .type = AW_CLK_NM, .clk.nm = &mmc2_clk},