[PATCH v2 2/2] clk: rockchip: rk3506: Register the SAI MCLK output gates

From: Xiangyu Zhu

Date: Sun Nov 22 2026 - 11:25:26 EST


The RK3506 has four SAI MCLK output gates in the PMU and system GRFs.
Register them with the existing GRF gate support so the SAI MCLK pin
direction can be controlled through the clock framework, the same way
RK3576 and RK3588 handle their SAI/I2S MCLK output gates.

The PMU GRF is added as an auxiliary GRF and the SAI0/SAI1 gates use
it, while the SAI2/SAI3 gates live in the system GRF, which is already
available to the CRU through the "rockchip,grf" phandle.

The PMU GRF lookup is not fatal: it only carries the SAI0/SAI1 MCLK
gates, so a missing syscon must not keep the whole CRU from being
registered.

Tested on a RK3506B board: the SAI0 MCLK output runs at 12.288 MHz and
drives the ES8388 codec, audio playback works, and the GRF gate bits
were read back from the registers to confirm that they get set.

Signed-off-by: Xiangyu Zhu <1194781887@xxxxxx>
---
drivers/clk/rockchip/clk-rk3506.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)

diff --git a/drivers/clk/rockchip/clk-rk3506.c b/drivers/clk/rockchip/clk-rk3506.c
index dd59bd60..d3c3452e 100644
--- a/drivers/clk/rockchip/clk-rk3506.c
+++ b/drivers/clk/rockchip/clk-rk3506.c
@@ -5,6 +5,7 @@
*/

#include <linux/clk-provider.h>
+#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -520,6 +521,8 @@ static struct rockchip_clk_branch rk3506_clk_branches[] __initdata = {
RK3506_CLKGATE_CON(14), 0, GFLAGS),
GATE(MCLK_OUT_SAI0, "mclk_out_sai0", "mclk_sai0", 0,
RK3506_CLKGATE_CON(14), 1, GFLAGS),
+ GATE_GRF(MCLK_OUT_SAI0_TO_IO, "mclk_sai0_to_io", "mclk_out_sai0",
+ 0, 0x4, 8, CLK_GATE_HIWORD_MASK, grf_type_pmu0),
COMPOSITE(MCLK_SAI1, "mclk_sai1", mclk_sai_asrc_parents_p, 0,
RK3506_CLKSEL_CON(41), 8, 4, MFLAGS, 0, 8, DFLAGS,
RK3506_CLKGATE_CON(14), 2, GFLAGS),
@@ -527,6 +530,8 @@ static struct rockchip_clk_branch rk3506_clk_branches[] __initdata = {
RK3506_CLKGATE_CON(14), 3, GFLAGS),
GATE(MCLK_OUT_SAI1, "mclk_out_sai1", "mclk_sai1", 0,
RK3506_CLKGATE_CON(14), 4, GFLAGS),
+ GATE_GRF(MCLK_OUT_SAI1_TO_IO, "mclk_sai1_to_io", "mclk_out_sai1",
+ 0, 0x4, 9, CLK_GATE_HIWORD_MASK, grf_type_pmu0),
GATE(HCLK_ASRC0, "hclk_asrc0", "hclk_lsperi_root", 0,
RK3506_CLKGATE_CON(14), 5, GFLAGS),
COMPOSITE(CLK_ASRC0, "clk_asrc0", gpll_v0pll_v1pll_g_parents_p, 0,
@@ -608,6 +613,8 @@ static struct rockchip_clk_branch rk3506_clk_branches[] __initdata = {
RK3506_CLKGATE_CON(18), 3, GFLAGS),
GATE(MCLK_OUT_SAI2, "mclk_out_sai2", "mclk_sai2", 0,
RK3506_CLKGATE_CON(18), 4, GFLAGS),
+ GATE_GRF(MCLK_OUT_SAI2_TO_IO, "mclk_sai2_to_io", "mclk_out_sai2",
+ 0, 0x4, 2, CLK_GATE_HIWORD_MASK, grf_type_sys),
COMPOSITE(MCLK_SAI3_SRC, "mclk_sai3_src", mclk_sai_asrc_parents_p, 0,
RK3506_CLKSEL_CON(52), 8, 4, MFLAGS, 0, 8, DFLAGS,
RK3506_CLKGATE_CON(18), 5, GFLAGS),
@@ -617,6 +624,8 @@ static struct rockchip_clk_branch rk3506_clk_branches[] __initdata = {
RK3506_CLKGATE_CON(18), 7, GFLAGS),
GATE(MCLK_OUT_SAI3, "mclk_out_sai3", "mclk_sai3_src", 0,
RK3506_CLKGATE_CON(18), 8, GFLAGS),
+ GATE_GRF(MCLK_OUT_SAI3_TO_IO, "mclk_sai3_to_io", "mclk_out_sai3",
+ 0, 0x4, 3, CLK_GATE_HIWORD_MASK, grf_type_sys),
COMPOSITE(MCLK_SAI4_SRC, "mclk_sai4_src", mclk_sai_asrc_parents_p, 0,
RK3506_CLKSEL_CON(53), 8, 4, MFLAGS, 0, 8, DFLAGS,
RK3506_CLKGATE_CON(18), 9, GFLAGS),
@@ -787,10 +796,20 @@ static void __init rk3506_clk_init(struct device_node *np)
struct rockchip_clk_provider *ctx;
unsigned long clk_nr_clks;
void __iomem *reg_base;
+ struct regmap *pmu_grf;

clk_nr_clks = rockchip_clk_find_max_clk_id(rk3506_clk_branches,
ARRAY_SIZE(rk3506_clk_branches)) + 1;

+ /*
+ * The PMU GRF only carries the SAI0/SAI1 MCLK output gates, so a
+ * missing (or not yet probed) syscon must not prevent the CRU itself
+ * from being registered.
+ */
+ pmu_grf = syscon_regmap_lookup_by_compatible("rockchip,rk3506-grf-pmu");
+ if (IS_ERR(pmu_grf))
+ pr_warn("%s: could not get PMU GRF syscon\n", __func__);
+
reg_base = of_iomap(np, 0);
if (!reg_base) {
pr_err("%s: could not map cru region\n", __func__);
@@ -804,6 +823,10 @@ static void __init rk3506_clk_init(struct device_node *np)
return;
}

+ if (!IS_ERR(pmu_grf) &&
+ rockchip_clk_add_grf(ctx, pmu_grf, grf_type_pmu0))
+ pr_warn("%s: could not add PMU GRF\n", __func__);
+
rockchip_clk_register_plls(ctx, rk3506_pll_clks,
ARRAY_SIZE(rk3506_pll_clks),
0);
--
2.47.3