From nobody Thu Nov 12 09:51:53 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 4jQFzG1sn2z70KZb for ; Thu, 12 Nov 2026 09:51:54 +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 4jQFzF3nfqz3GdV for ; Thu, 12 Nov 2026 09:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477113; 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=zjge4m3wBJA5yMSaJdWibjaYAi5qA6UzvenP8zNqp4I=; b=FFeMKFIp9kfI0BPzQYEcRXPgqblmdgS7jJiBFDXgReZ6nU2G+raGr5a8bTfA1naBC/oPS8 RjPV/BW06swD0PjwQ/Aigci/wG2cJ5Fs7AY8IAHH9xgVfPNMHenmuR9kE0zE7tbo6lR1MM yZ8FbeZAGnaSv56VqZgk+voZycdmYjycJQ2uQ9lxAql5uQQhLVlyXoYMLY1PuRVQ+7xz9V AqnU3JzLQ56taSGA7TvyPUXhj2Xan+Su7f+ZzSuJyZSwzROK01nWB883TtTZOnOp2yqwKy wGabY7TzqXICjVxwhOQT3Y2hhYuo3AkH7JfkYfdduj/FWpYeJFgx62KfJfPAvA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794477113; b=D3Gw11eshPRulVdzzC3Pj4EwcRx1O/yNH0FKTCEoqFQrgu/tP9YuiHlJQdgbRCrqDZ7+0j 0AIrG6lrePNBgw/2r1ThzwqHc9Y5NUe+DuW5ogiOf0hfP5LJSFNDmZzGntYMHFDYwpSjgZ zXv3rtzNzTXfbj4ZHUu+UaJhTtmLsjRWuSLH34iNtu3+ACWTYDzHNz06OG/SJ2hZGhgMll iE8JkMZBLLbwWstcNjtjC3QNzS/ZF3ovOfGmkWc5YOe3hbN8h01G7WPQu+Gi9JrLlh1rJK Qy4hE04P3OC50J/bqzgihlJlGR7bvga1v4QnInBzXVavVqr+eswkfq9yyBhIpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477113; 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=zjge4m3wBJA5yMSaJdWibjaYAi5qA6UzvenP8zNqp4I=; b=vSiXVlRTtQl5CaVO1NctLaBA5nauXSyQQUJvY9ci4uPI7MGNS5GF/XI40QeEaBM4/Uu5A8 DiO/DJPe2P0LrMscxEnfDRn9VuafOd+Lm1eCmyvyFWbf26KmpxH/8J8PncEQEr+eLr2bYZ 5QQ7Zfj8cqWIndfhGa8sw1OlBjxfjrqf8KoJ1VJEfCjq2KAv8qDbWMxwlMUSPIi/jvkFhA JgKYYhZkFWV2EwH7IyT40DczID90Q+tafGfIAJidLWv2tX9we40mlUdnZsgD8GXRKfnVWc n27c6SvSXgj/2tWBpCuuJStBCbR3UyjJVvvNbBR8unuMiuRZOwR87m3p2pthcg== 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 4jQFzF3T4mzyC4 for ; Thu, 12 Nov 2026 09:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f7c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:51:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: c1dbf3f51352 - main - aw_ccu: h6: Use the 1x PLL_PERIPH as parents of the MMC 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: c1dbf3f5135205ddcd3056e08a1477f366f28cea Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:51:53 +0000 Message-Id: <6af58c39.1f7c8.2d990883@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c1dbf3f5135205ddcd3056e08a1477f366f28cea commit c1dbf3f5135205ddcd3056e08a1477f366f28cea Author: Emmanuel Vadot AuthorDate: 2026-11-09 19:30:39 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-12 09:50:24 +0000 aw_ccu: h6: Use the 1x PLL_PERIPH as parents of the MMC clocks The MMC clocks of the H6 have the doubled outputs of the PLL_PERIPH0 and PLL_PERIPH1 as inputs of their mux, followed by a fixed post divider of 2 that the driver does not know about. The rate it computed was twice the real one: on a Pine H64 the SD card requested at 50MHz and the eMMC at 52MHz ran at half of that, and transfers at about half the speed they should reach. U-Boot does the same compensation, as it pretends the parent is the 1x PLL. Name the 1x PLLs as parents, like the H3 driver does. The position in the mux is the same. Tested on: H6 --- sys/dev/clk/allwinner/ccu_h6.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c index 7bc3335023e3..a9f1e638b0c8 100644 --- a/sys/dev/clk/allwinner/ccu_h6.c +++ b/sys/dev/clk/allwinner/ccu_h6.c @@ -638,7 +638,12 @@ NM_CLK(apb2_clk, /* Missing MBUS clock */ -static const char *mod_parents[] = {"osc24M", "pll_periph0_2x", "pll_periph1_2x"}; +/* + * The mux of the module clocks takes the doubled PLL_PERIPH outputs, but they + * have a fixed post divider of 2 that is not modeled: use the 1x PLLs, which + * gives the same rate with the same mux selection. + */ +static const char *mod_parents[] = {"osc24M", "pll_periph0", "pll_periph1"}; NM_CLK(mmc0_clk, CLK_MMC0, "mmc0", mod_parents, /* id, name, parents */ 0x830, /* offset */