Skip to content

Commit c536e00

Browse files
TroyMitchell911dlan17
authored andcommitted
clk: spacemit: fix sspax_clk
Hardware Requirement: BIT[3] of this register must be set if need to select i2s_bclk as SSPA parent clock, to solve this, introduces a new SSPAx_I2S_BCLK clock as the virtual gate clock. Fixes: 1b72c59 ("clk: spacemit: Add clock support for SpacemiT K1 SoC") Suggested-by: Yao Zi <ziyao@disroot.org> Reviewed-by: Haylen Chu <heylenay@4d2.org> Signed-off-by: Troy Mitchell <troy.mitchell@linux.spacemit.com> Link: https://lore.kernel.org/r/20250811-k1-clk-i2s-v5-2-ebadd06e1e91@linux.spacemit.com Signed-off-by: Yixun Lan <dlan@gentoo.org>
1 parent 7d50d9b commit c536e00

1 file changed

Lines changed: 25 additions & 4 deletions

File tree

drivers/clk/spacemit/ccu-k1.c

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,18 +247,37 @@ CCU_GATE_DEFINE(aib_clk, CCU_PARENT_NAME(vctcxo_24m), APBC_AIB_CLK_RST, BIT(1),
247247

248248
CCU_GATE_DEFINE(onewire_clk, CCU_PARENT_NAME(vctcxo_24m), APBC_ONEWIRE_CLK_RST, BIT(1), 0);
249249

250-
static const struct clk_parent_data sspa_parents[] = {
250+
/*
251+
* When i2s_bclk is selected as the parent clock of sspa,
252+
* the hardware requires bit3 to be set
253+
*/
254+
CCU_GATE_DEFINE(sspa0_i2s_bclk, CCU_PARENT_HW(i2s_bclk), APBC_SSPA0_CLK_RST, BIT(3), 0);
255+
CCU_GATE_DEFINE(sspa1_i2s_bclk, CCU_PARENT_HW(i2s_bclk), APBC_SSPA1_CLK_RST, BIT(3), 0);
256+
257+
static const struct clk_parent_data sspa0_parents[] = {
251258
CCU_PARENT_HW(pll1_d384_6p4),
252259
CCU_PARENT_HW(pll1_d192_12p8),
253260
CCU_PARENT_HW(pll1_d96_25p6),
254261
CCU_PARENT_HW(pll1_d48_51p2),
255262
CCU_PARENT_HW(pll1_d768_3p2),
256263
CCU_PARENT_HW(pll1_d1536_1p6),
257264
CCU_PARENT_HW(pll1_d3072_0p8),
258-
CCU_PARENT_HW(i2s_bclk),
265+
CCU_PARENT_HW(sspa0_i2s_bclk),
259266
};
260-
CCU_MUX_GATE_DEFINE(sspa0_clk, sspa_parents, APBC_SSPA0_CLK_RST, 4, 3, BIT(1), 0);
261-
CCU_MUX_GATE_DEFINE(sspa1_clk, sspa_parents, APBC_SSPA1_CLK_RST, 4, 3, BIT(1), 0);
267+
CCU_MUX_GATE_DEFINE(sspa0_clk, sspa0_parents, APBC_SSPA0_CLK_RST, 4, 3, BIT(1), 0);
268+
269+
static const struct clk_parent_data sspa1_parents[] = {
270+
CCU_PARENT_HW(pll1_d384_6p4),
271+
CCU_PARENT_HW(pll1_d192_12p8),
272+
CCU_PARENT_HW(pll1_d96_25p6),
273+
CCU_PARENT_HW(pll1_d48_51p2),
274+
CCU_PARENT_HW(pll1_d768_3p2),
275+
CCU_PARENT_HW(pll1_d1536_1p6),
276+
CCU_PARENT_HW(pll1_d3072_0p8),
277+
CCU_PARENT_HW(sspa1_i2s_bclk),
278+
};
279+
CCU_MUX_GATE_DEFINE(sspa1_clk, sspa1_parents, APBC_SSPA1_CLK_RST, 4, 3, BIT(1), 0);
280+
262281
CCU_GATE_DEFINE(dro_clk, CCU_PARENT_HW(apb_clk), APBC_DRO_CLK_RST, BIT(1), 0);
263282
CCU_GATE_DEFINE(ir_clk, CCU_PARENT_HW(apb_clk), APBC_IR_CLK_RST, BIT(1), 0);
264283
CCU_GATE_DEFINE(tsen_clk, CCU_PARENT_HW(apb_clk), APBC_TSEN_CLK_RST, BIT(1), 0);
@@ -865,6 +884,8 @@ static struct clk_hw *k1_ccu_apbc_hws[] = {
865884
[CLK_SSPA1_BUS] = &sspa1_bus_clk.common.hw,
866885
[CLK_TSEN_BUS] = &tsen_bus_clk.common.hw,
867886
[CLK_IPC_AP2AUD_BUS] = &ipc_ap2aud_bus_clk.common.hw,
887+
[CLK_SSPA0_I2S_BCLK] = &sspa0_i2s_bclk.common.hw,
888+
[CLK_SSPA1_I2S_BCLK] = &sspa1_i2s_bclk.common.hw,
868889
};
869890

870891
static const struct spacemit_ccu_data k1_ccu_apbc_data = {

0 commit comments

Comments
 (0)