From nobody Fri Nov 20 13:55:47 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 4jWH0z5fKcz71nLg for ; Fri, 20 Nov 2026 13:55:47 +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 4jWH0z2DMRz4Tbs for ; Fri, 20 Nov 2026 13:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795182947; 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=ZulPmqDI7OctuGVKbW2ZwSwh6rb0NTY1SownXlaCsb4=; b=WRnRTRqGaJ00Cpy3Hum0lFjTa6UOiAKlEIE5hTn6N9dc8vBGhnF/pOYZ5+xrn1RkRmB5CC wH3ujQfzO/7QQGaJ4Wj2yfh6QJP8N+9R7E8Fv8fd6EY5QHSNTYfdANgPiCPyHNZFHMV8Se ywc1/byosoa8Y9Sjo9+wCVk8/KN/OHntRORz2AyNAsWLXlgUxPRopEDT0JYdgq8waaG/np u0K9MfnxyPLfN4WGwrZmxbJTfh9m7S/rSe84QEUQgltcG5GbY4hL/n0Y3OmYEscYVs/Xjj o+5fuT3iqUEtWQboAAUC0wn7+ytiheuJteF+HViplBsgzzVlwS4rzCVy2n4HAA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795182947; b=yLEQAVZjm+hjfW5IkfWxLozGe2yqTcsy6Hm/V+YvNAbrl0TRp+eU//KC3hS8Ai/2h4ZOkr z4D7e4Oodz0GCkdcUcPsx59RFnVmQnXjOKu0AmUfSxxhyU3p4GLeW6EOluAoBzU3I3KJGS 457QI71+Y65mbfXmuiakFKk2Ods15pHoY8KBFZY1/tVEojt/f3K28oaj1cUrnhgTGuRBSm z2qj9KoXhSoxwri58VPezW1gj8qJc7ihzlnyZGi1AqpoMz70JseO2k759w/qF8mGSsw3HE jxpAigiol8XLksnLcrNO8qjTQnLYeLn1pHyzRtHhpU9acNx53XxhQassFBeOJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795182947; 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=ZulPmqDI7OctuGVKbW2ZwSwh6rb0NTY1SownXlaCsb4=; b=XG6KId9mUrbUTaJA419hX1IYqfk8QwfSQGMfrfzXlqZaWIJgShIKcYE3lpJb3ZL46jVasn 3/bKT5dIQZ/csShXMr5g/PdJNCIBquzyNfnzUfzoarjV5DlpouJY2Jfq1Wlao12x6EILew iBUdJu/7TiLU/SAyZWc9lvW6Z2r818tDnePLYXdD/FShfv7Ciz9O5m+sbAUgzlZFSN8TBy P+BbhlewWNTivD2mM3g7iEiSLz7trf3m4A9YlZUf5tkn2q0d7aMsYh/uBi+ObKAxfgYCzL hg89jJQYAouEGIDL4QgBUOF8OtbWJwTrwTS4co7f3MQQmsqUq/9D3eEpF5Ecyw== 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 4jWH0z1MGxzrjZ for ; Fri, 20 Nov 2026 13:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 10116 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 13:55:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8559cae1ebf2 - main - rk3568_cru: Allow the GMAC RGMII speed clock to reparent 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: 8559cae1ebf28dba263e81975e737dd5889095e1 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 13:55:47 +0000 Message-Id: <6b005163.10116.a25e8e3@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8559cae1ebf28dba263e81975e737dd5889095e1 commit 8559cae1ebf28dba263e81975e737dd5889095e1 Author: Emmanuel Vadot AuthorDate: 2026-10-21 10:07:57 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-20 13:55:19 +0000 rk3568_cru: Allow the GMAC RGMII speed clock to reparent The RGMII speed mux selects between the 125MHz GMAC clock and fixed dividers of it that provide the 25MHz (100M) and 2.5MHz (10M) clocks. Without RK_CLK_MUX_REPARENT the mux does not try its parents and the rate request is forwarded to clk_gmac0 (and above), where it fails with EBUSY because that clock is enabled by more than one consumer. Mark both RGMII speed muxes as reparenting so that the rate is achieved by selecting the appropriate fixed divider. Reviewed by: oh Differential Revision: https://reviews.freebsd.org/D61019 --- sys/dev/clk/rockchip/rk3568_cru.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/clk/rockchip/rk3568_cru.c b/sys/dev/clk/rockchip/rk3568_cru.c index c3de5e9213c9..19143ad70b2d 100644 --- a/sys/dev/clk/rockchip/rk3568_cru.c +++ b/sys/dev/clk/rockchip/rk3568_cru.c @@ -512,7 +512,7 @@ static struct rk_clk rk3568_clks[] = { MUX(SCLK_GMAC0_RMII_SPEED, "clk_gmac0_rmii_speed", mux_gmac0_rmii_speed_p, 0, 31, 3, 1), MUX(SCLK_GMAC0_RGMII_SPEED, "clk_gmac0_rgmii_speed", - mux_gmac0_rgmii_speed_p, 0, 31, 4, 2), + mux_gmac0_rgmii_speed_p, RK_CLK_MUX_REPARENT, 31, 4, 2), MUX(0, "clk_mac0_2top_sel", clk_mac_2top_p, 0, 31, 8, 2), MUX(0, "clk_gmac0_ptp_ref_sel", clk_gmac_ptp_p, 0, 31, 12, 2), MUX(0, "clk_mac0_out_sel", cpll125_cpll50_cpll25_xin24m_p, 0, 31, 14, 2), @@ -537,7 +537,7 @@ static struct rk_clk rk3568_clks[] = { MUX(SCLK_GMAC1_RMII_SPEED, "clk_gmac1_rmii_speed", mux_gmac1_rmii_speed_p, 0, 33, 3, 1), MUX(SCLK_GMAC1_RGMII_SPEED, "clk_gmac1_rgmii_speed", - mux_gmac1_rgmii_speed_p, 0, 33, 4, 2), + mux_gmac1_rgmii_speed_p, RK_CLK_MUX_REPARENT, 33, 4, 2), /* 6:7 Reserved */ MUX(0, "clk_mac1_2top_sel", clk_mac_2top_p, 0, 33, 8, 2), MUX(0, "clk_gmac1_ptp_ref_sel", clk_gmac_ptp_p, 0, 33, 12, 2),