From nobody Thu Nov 05 14:51:10 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 4jL4xq0RYMz706qQ for ; Thu, 05 Nov 2026 14:51:11 +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 4jL4xp3wM2z3Dmb for ; Thu, 05 Nov 2026 14:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793890270; 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=akSk2zdQjOYq1yRRA5Ikd9yhMnHkSbdRIfOgahMoCVM=; b=hQkPh6zJFhWUTB3gXuO7gy8h1S4kJzCI5SMWrGV63szkZbOy56eS7Z/wrRnDNFVisYU9eX bXjkT7MMn7YotmLf8M7vzl1fFNSWgc68j1DcTa7g3GFxndGoZPRQbJLYHv4PilOTlVR0u7 gt+Z+5gr0nRo4yyzviXutGrZvNBDqvI60I2Z9Qh8LPGEcFNbnEbC+x0Vn7vVSig64Xxarb rmwItW7diE78veJJt2qDdgykh/gCPTKtMoxoO8oX44bK0vx7ulE9NNwHfJMFkw7OXwcW/O wKNmDPrJfqtLwh3xwIdHDZkcvMbt96IS8J767ZP2F4S+hzn0ucIAMWd75NLCMA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793890270; b=qlTYkd25F2NkRaTPF01nBDq7fomVmch/SRSFErbhSCTDI9pPdwJFcbv4hz/O1NDEPsEdQp sZ5C0N1ezoGbJxT/wRt3pLJI0dRSei+tqKzHabQ1Bdo+U4FTH2ByT8jXRzUMHVpP5nX6Oz JS29zaJtioIhNK8S0qjUeFEKj6S8DpZZyjmrgG7tzXm2q7Yw2vlXBmiqFNZLuKN86gkc8/ VPAoUGvGvKFpdZrhI0KRbRXkKJdQKeSKm6YBmW6CplJymaAM/6yFqGliWvdSBqTqGXczoe 0B8cQPLVilDFXewML66iqj7XTN8ovsLm+s3EoUnC71IRWdI1j2t27P7GQx5jCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793890270; 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=akSk2zdQjOYq1yRRA5Ikd9yhMnHkSbdRIfOgahMoCVM=; b=SDvpgrf+G9sTA0PLaO+8BqfJpV3/731q+EyheOULrKjzo4PDwspqlRG5b0jPzFUbmp3rDn W7VsaJ6gbIC+eY4iQxwJXIzF++d+YHh+e9eCjIIdVmBLXt8tUliqnpTJDHhtCZ2uJoNVYm TDyFH1aylJWzje4q1Mnq/Ga1wR74VyeP1VaQef240Z79YI/UkHu+aAv6EJCovjfujHxMvp NRN0jQDk2wWwu0pq+QnG1X9V1xWn52DxPk7B3cXp5QtMyNIomR0Lm9zMwJoniQke6t9Bio eQPdi2PHRL0FEEjMw52pENPtfr3ZL4xq50vAVhvEYhpcKlxqX7e2+q4kyhAPRQ== 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 4jL4xp3Z4kztw5 for ; Thu, 05 Nov 2026 14:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b1a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 14:51:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 090ffc7f016d - main - clk: rockchip: rk3568: Select the sdmmc source clocks by rate List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 090ffc7f016df7eb0ec11e2b1966c3b5ee7ea9e0 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 14:51:10 +0000 Message-Id: <6aec97de.22b1a.29bfc373@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=090ffc7f016df7eb0ec11e2b1966c3b5ee7ea9e0 commit 090ffc7f016df7eb0ec11e2b1966c3b5ee7ea9e0 Author: Emmanuel Vadot AuthorDate: 2026-10-20 11:04:15 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-05 14:50:33 +0000 clk: rockchip: rk3568: Select the sdmmc source clocks by rate The sdmmc clocks are muxes without a divider, whose parents provide the 750kHz clock for card identification and the 50MHz and 100MHz clocks for the bus. Use RK_CLK_MUX_ROUND_PARENT so that the host driver can change the card clock, which used to fail with EBUSY and left the SD cards at half speed. Differential Revision: https://reviews.freebsd.org/D60891 --- sys/dev/clk/rockchip/rk3568_cru.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/clk/rockchip/rk3568_cru.c b/sys/dev/clk/rockchip/rk3568_cru.c index 9891adb26415..7305de309ea6 100644 --- a/sys/dev/clk/rockchip/rk3568_cru.c +++ b/sys/dev/clk/rockchip/rk3568_cru.c @@ -497,9 +497,11 @@ static struct rk_clk rk3568_clks[] = { MUX(0, "aclk_php_sel", gpll300_gpll200_gpll100_xin24m_p, 0, 30, 0, 2), MUX(0, "hclk_php_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 30, 2, 2), CDIV(0, "pclk_php_div", "aclk_php", 0, 30, 4, 4), - MUX(0, "clk_sdmmc0_sel", clk_sdmmc_p, 0, 30, 8, 3), + MUX(0, "clk_sdmmc0_sel", clk_sdmmc_p, + RK_CLK_MUX_ROUND_PARENT, 30, 8, 3), /* 11 Reserved */ - MUX(0, "clk_sdmmc1_sel", clk_sdmmc_p, 0, 30, 12, 3), + MUX(0, "clk_sdmmc1_sel", clk_sdmmc_p, + RK_CLK_MUX_ROUND_PARENT, 30, 12, 3), /* 15 Reserved */ /* CRU_CLKSEL_CON31 */ @@ -523,7 +525,8 @@ static struct rk_clk rk3568_clks[] = { MUX(0, "aclk_usb_sel", gpll300_gpll200_gpll100_xin24m_p, 0, 32, 0, 2), MUX(0, "hclk_usb_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 32, 4, 2), CDIV(0, "pclk_usb_div", "aclk_usb", 0, 32, 4, 4), - MUX(0, "clk_sdmmc2_sel", clk_sdmmc_p, 0, 32, 8, 3), + MUX(0, "clk_sdmmc2_sel", clk_sdmmc_p, + RK_CLK_MUX_ROUND_PARENT, 32, 8, 3), /* 11:15 Reserved */ /* CRU_CLKSEL_CON33 */