From nobody Thu Nov 12 09:51:40 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 4jQFz1272yz70KN2 for ; Thu, 12 Nov 2026 09:51:41 +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 4jQFz071Xsz3GXs for ; Thu, 12 Nov 2026 09:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477101; 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=wsVpqilmeYNFzMPcS4j3Pz6xUdIZWypXetAqKdGcHBU=; b=X7HxFbyt3n6ssyk7l+KR2Et3+HA8tdedN9unxtjBPKDt/GtkL2pzOkHVrhQhlLMdj0bjQD QDpbuX2GU9FOMeFawnY3YioGn6qRfflE9TKR0fsAriA6C/9YPBJ5hbJhYZZqT1yB+Zgw9l wXBOuhe6sLPsfl+4UBbLAzikBJ3Yk4PsyMyjhYxDx4BYhO/nGsFxrgD1NnNNA9MDb3R56s YeDuZne34UyM8+grS8QRxPVd/z65PUziysg4pn5h4dttPMTUYrY528a/efEtGVQTvxN43D WPfqxba9wlwoGOamN175tR/qyvxMK2b6X1Wta5A+pmIi29A2uTHLI1G82sgWVQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794477101; b=M6TQSBhRL/TJfeH55aicfwN60mmMEL9n6OFqEBc5hxykCQBtslTd4yujv6ibU5t/Q+Wkoe kBTRoCF8bNmCfkGVToCi9DZdLBH/VP4PfgaWPmdyVSDTrOYOjB1QLyvK480BaPp/mgaWHt VuQ9DYtHDIDkW4OK5waKWFxYV3PhgZces94j8x4GypmCUO3sry/9kDGVV/fOABG550hlIi nrBcMBi0vM3+k9+flMveFjZeQlVne2IrnNqQTj28QXnDj9jBvuvuaa0HqPPXX2PmHILSeR coTIljCubNI7MP2PsuV1LdD6/W+M/6hj0TbDehy7uHnViwBcwlNTrvmT6NkP2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477101; 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=wsVpqilmeYNFzMPcS4j3Pz6xUdIZWypXetAqKdGcHBU=; b=xec773h7KzEYJLW6rSXkdYNB3IqYAZSdsHnPs19v/vwyDj7OZAa6XEzHHyos/uwgGI4aTA 6qYpOagia5rBh2V9bul/O1xNfwCdN+ZV9lng/pxxEyPvxTUh8Ro5DADSvOo9wUEmQd6DNE IXXEWfCI1UMTRKLdQTq52mC9n4O3Ugm44ifdaQqgbt3EguC6FXV6QdU+Cc1FEzSGIkaOVL TIs+4OoWTbeWPPBZD+lROcKvxp1Ru/gE8HrQqH/kPwTKP0EC6xQRQJnKDdPW6/73Auw0ui sFKoN/3IO3MwxBHPSV/3+Byb9t5LMaSzWYF1iTgrM2ne0Vti97NkHh5FoLucYw== 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 4jQFz06c7rzxg4 for ; Thu, 12 Nov 2026 09:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cafb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:51:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 6f35f21323c1 - main - aw_ccu: h6: Add the DRAM clock 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: 6f35f21323c1cfcfc137087af0cd5d8f4a995c46 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:51:40 +0000 Message-Id: <6af58c2c.1cafb.6149a029@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=6f35f21323c1cfcfc137087af0cd5d8f4a995c46 commit 6f35f21323c1cfcfc137087af0cd5d8f4a995c46 Author: Emmanuel Vadot AuthorDate: 2026-11-10 17:07:12 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-12 09:47:31 +0000 aw_ccu: h6: Add the DRAM clock Add the DRAM clock, which is PLL_DDR0 divided by 1 to 4, and the bus gate and the reset of the DRAM. The firmware sets up the DRAM, they are not meant to be changed. Tested on: H6 --- sys/dev/clk/allwinner/ccu_h6.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c index 5251ae5f3aa5..a1848d5e820d 100644 --- a/sys/dev/clk/allwinner/ccu_h6.c +++ b/sys/dev/clk/allwinner/ccu_h6.c @@ -71,6 +71,8 @@ #define CLK_AHB3 25 #define CLK_APB2 27 #define CLK_MBUS 28 +#define CLK_DRAM 52 +#define CLK_BUS_DRAM 60 static struct aw_ccung_reset h6_ccu_resets[] = { /* MBUS_CFG_REG */ @@ -104,6 +106,9 @@ static struct aw_ccung_reset h6_ccu_resets[] = { */ CCU_RESET(RST_BUS_IOMMU, 0x7bc, 16) + /* DRAM_BGR_REG */ + CCU_RESET(RST_BUS_DRAM, 0x80c, 16) + /* SMHC_BGR_REG */ CCU_RESET(RST_BUS_MMC0, 0x84c, 16) CCU_RESET(RST_BUS_MMC1, 0x84c, 17) @@ -183,6 +188,9 @@ static struct aw_ccung_gate h6_ccu_gates[] = { CCU_GATE(CLK_MBUS_CSI, "mbus-csi", "mbus", 0x804, 8) CCU_GATE(CLK_MBUS_DEINTERLACE, "mbus-deinterlace", "mbus", 0x804, 11) + /* DRAM_BGR_REG */ + CCU_GATE(CLK_BUS_DRAM, "bus-dram", "psi_ahb1_ahb2", 0x80c, 0) + /* SMHC_BGR_REG */ CCU_GATE(CLK_BUS_MMC0, "bus-mmc0", "ahb3", 0x84c, 0) CCU_GATE(CLK_BUS_MMC1, "bus-mmc1", "ahb3", 0x84c, 1) @@ -535,6 +543,16 @@ M_CLK(mbus_clk, 31, /* gate */ AW_CLK_HAS_MUX | AW_CLK_HAS_GATE); /* flags */ +/* The DRAM is set up by the firmware, its rate should not be changed */ +static const char *dram_parents[] = {"pll_ddr0"}; +M_CLK(dram_clk, + CLK_DRAM, "dram", dram_parents, /* id, name, parents */ + 0x800, /* offset */ + 0, 2, 0, 0, /* m factor */ + 24, 2, /* mux */ + 0, /* 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}, @@ -556,6 +574,7 @@ static struct aw_ccung_clk h6_ccu_clks[] = { { .type = AW_CLK_NM, .clk.nm = &apb1_clk}, { .type = AW_CLK_NM, .clk.nm = &apb2_clk}, { .type = AW_CLK_M, .clk.m = &mbus_clk}, + { .type = AW_CLK_M, .clk.m = &dram_clk}, { .type = AW_CLK_NM, .clk.nm = &mmc0_clk}, { .type = AW_CLK_NM, .clk.nm = &mmc1_clk},