From nobody Thu Nov 12 09:51:44 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 4jQFz42m8Lz70KHW for ; Thu, 12 Nov 2026 09:51:44 +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 4jQFz40rrQz3G69 for ; Thu, 12 Nov 2026 09:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477104; 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=ONYNfCo3rk+TvwQk1MA4k8yKr4vfDEk/CRRG7Zd43jc=; b=rbgJ4SRBaRDArfhJC/YX5dXBTPSqyLGE+e467f0MijTFhu19yfOzxD7cIOp6dHGw5NHlIN vJpgTkvtDwoQIVSwoKSjBdIBNZ1g2raY418dt2U6jEejzFjaEnnoWvnnxHD27/8s8wtO1o 08ktv86M7HRxsluFO00y2Eh42MzrSeA5fE9aqaSAMbVSNRLYjmonabtEqOSuShLL23NkJo B4UlWojGAvfFmBasVBMcmkEqyA0vRRGTYHW2/mKthhY04op8ricwMKXtrf5ABmR8tvIf0W nwWk0i2ByRCHr/bDY6BV67Y0dUqCG/7jElftaS4ZKd/2bMGqo1mBF9kxc7PwRA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794477104; b=Vmf8wTLlDbgu/xOGFN+8aSu6QucX92dzE38K/a3xCUI7M1hbiw4BpK+i8oaxmL/Obcuv0U 0g2zz9E2vJr5dniREI+O3Bb1rD1STaRGpaPuE22VgcaxhXv6aOS2ryCS1zImQGrOSaDsbm uFi5HAd+v5nj0LmHWAUrjAMV9wvZ/G2loZjXJbPwjU/LkvtPti1nRIzJS364cK9tyZnMM0 Rm3BYMuCWqUP74AGDilPxKzEwzqg3E2dQlxAEIytM/3joEYCna6MJstcFTYJgUI5jyuYwJ WyUZ/Ij66lexemaWvVbSrrYtN+ZHpe59N7xlb1BeuXP4oIFUflG9LunugI2ouA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477104; 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=ONYNfCo3rk+TvwQk1MA4k8yKr4vfDEk/CRRG7Zd43jc=; b=QmAHekoAcy6HfI+TCnSinwnJpEWmj7nj85spRMNFnMKo8j2UNc7hNZzhatBwmkOGabXlt4 KtpWShdaRAV6RT/6VXdgr7Vdr6tGl+9feIP0q7+7av9bXzNPtBj1FSrjSwq4uwQeazyOOC PA1W4GQH+n3GDPmmKROopT6dIMzmSksL/yyNVPltD+VclgtyCJeR/LcOXfxrH8h9UF7LaD fS1KjjWc+Id+wrwouzLg2yZezW3GyWUAOW9zEeEcvFfvoGdcErKo6H/PVXELFD9W24J57L eyx0q6BPH9BUDAy4FjCKsl2xhStCwD4SNzy+GZ9Fdnd7VXCTjajFsF3ZyfR6YQ== 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 4jQFz40XBqzyBv for ; Thu, 12 Nov 2026 09:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f8c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:51:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: df6fa026b8f9 - main - aw_ccu: h6: Add the HDMI, TCON and HDCP 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: df6fa026b8f94c1545bc19a51abff1ccf0fce120 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:51:44 +0000 Message-Id: <6af58c30.1f8c2.f3a6726@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=df6fa026b8f94c1545bc19a51abff1ccf0fce120 commit df6fa026b8f94c1545bc19a51abff1ccf0fce120 Author: Emmanuel Vadot AuthorDate: 2026-11-10 17:22:04 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-12 09:47:32 +0000 aw_ccu: h6: Add the HDMI, TCON and HDCP clocks Add the module clocks, bus gates and resets of HDMI, TCON LCD0, TCON TV0 and HDCP, and the HDMI slow clock. The TCON LCD clock has no divider. The HDMI CEC clock is not added, its second parent is PLL_PERI0(2X) divided by 36621, which needs a fixed pre-divider. Tested on: H6 --- sys/dev/clk/allwinner/ccu_h6.c | 80 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c index 0f0a824dd798..f5bac63420ba 100644 --- a/sys/dev/clk/allwinner/ccu_h6.c +++ b/sys/dev/clk/allwinner/ccu_h6.c @@ -187,6 +187,22 @@ static struct aw_ccung_reset h6_ccu_resets[] = { CCU_RESET(RST_BUS_XHCI, 0xa8c, 21) CCU_RESET(RST_BUS_EHCI3, 0xa8c, 23) CCU_RESET(RST_BUS_OTG, 0xa8c, 24) + + /* HDMI_BGR_REG */ + CCU_RESET(RST_BUS_HDMI, 0xb1c, 16) + CCU_RESET(RST_BUS_HDMI_SUB, 0xb1c, 17) + + /* DISPLAY_IF_TOP_BGR_REG */ + CCU_RESET(RST_BUS_TCON_TOP, 0xb5c, 16) + + /* TCON_LCD_BGR_REG */ + CCU_RESET(RST_BUS_TCON_LCD0, 0xb7c, 16) + + /* TCON_TV_BGR_REG */ + CCU_RESET(RST_BUS_TCON_TV0, 0xb9c, 16) + + /* HDMI_HDCP_BGR_REG */ + CCU_RESET(RST_BUS_HDCP, 0xc4c, 16) }; static struct aw_ccung_gate h6_ccu_gates[] = { @@ -310,6 +326,24 @@ static struct aw_ccung_gate h6_ccu_gates[] = { CCU_GATE(CLK_BUS_XHCI, "bus-xhci", "ahb3", 0xa8c, 5) CCU_GATE(CLK_BUS_EHCI3, "bus-ehci3", "ahb3", 0xa8c, 7) CCU_GATE(CLK_BUS_OTG, "bus-otg", "ahb3", 0xa8c, 8) + + /* HDMI_SLOW_CLK_REG */ + CCU_GATE(CLK_HDMI_SLOW, "hdmi-slow", "osc24M", 0xb04, 31) + + /* HDMI_BGR_REG */ + CCU_GATE(CLK_BUS_HDMI, "bus-hdmi", "ahb3", 0xb1c, 0) + + /* DISPLAY_IF_TOP_BGR_REG */ + CCU_GATE(CLK_BUS_TCON_TOP, "bus-tcon-top", "ahb3", 0xb5c, 0) + + /* TCON_LCD_BGR_REG */ + CCU_GATE(CLK_BUS_TCON_LCD0, "bus-tcon-lcd0", "ahb3", 0xb7c, 0) + + /* TCON_TV_BGR_REG */ + CCU_GATE(CLK_BUS_TCON_TV0, "bus-tcon-tv0", "ahb3", 0xb9c, 0) + + /* HDMI_HDCP_BGR_REG */ + CCU_GATE(CLK_BUS_HDCP, "bus-hdcp", "ahb3", 0xc4c, 0) }; static const char *osc12m_parents[] = {"osc24M"}; @@ -757,6 +791,47 @@ M_CLK(vp9_clk, 31, /* gate */ AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ +static const char *hdmi_parents[] = {"pll_video0", "pll_video1", + "pll_video1_4x"}; +M_CLK(hdmi_clk, + CLK_HDMI, "hdmi", hdmi_parents, /* id, name, parents */ + 0xb00, /* offset */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +/* The TCON LCD clock has no divider */ +static const char *tcon_lcd0_parents[] = {"pll_video0", "pll_video0_4x", + "pll_video1"}; +M_CLK(tcon_lcd0_clk, + CLK_TCON_LCD0, "tcon-lcd0", tcon_lcd0_parents, /* id, name, parents */ + 0xb60, /* offset */ + 0, 0, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +static const char *tcon_tv0_parents[] = {"pll_video0", "pll_video0_4x", + "pll_video1", "pll_video1_4x"}; +NM_CLK(tcon_tv0_clk, + CLK_TCON_TV0, "tcon-tv0", tcon_tv0_parents, /* id, name, parents */ + 0xb80, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 3, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ + +static const char *hdcp_parents[] = {"pll_periph0", "pll_periph1"}; +M_CLK(hdcp_clk, + CLK_HDCP, "hdcp", hdcp_parents, /* id, name, parents */ + 0xc40, /* offset */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* 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}, @@ -795,6 +870,11 @@ static struct aw_ccung_clk h6_ccu_clks[] = { { .type = AW_CLK_NM, .clk.nm = &emce_clk}, { .type = AW_CLK_M, .clk.m = &vp9_clk}, + { .type = AW_CLK_M, .clk.m = &hdmi_clk}, + { .type = AW_CLK_M, .clk.m = &tcon_lcd0_clk}, + { .type = AW_CLK_NM, .clk.nm = &tcon_tv0_clk}, + { .type = AW_CLK_M, .clk.m = &hdcp_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},