git: 090ffc7f016d - main - clk: rockchip: rk3568: Select the sdmmc source clocks by rate
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 05 Nov 2026 14:51:10 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=090ffc7f016df7eb0ec11e2b1966c3b5ee7ea9e0
commit 090ffc7f016df7eb0ec11e2b1966c3b5ee7ea9e0
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-10-20 11:04:15 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
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 */