Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 1b72c59db0add ("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>

authored by

Troy Mitchell and committed by
Yixun Lan
c536e00d 7d50d9bf

+25 -4
+25 -4
drivers/clk/spacemit/ccu-k1.c
··· 247 247 248 248 CCU_GATE_DEFINE(onewire_clk, CCU_PARENT_NAME(vctcxo_24m), APBC_ONEWIRE_CLK_RST, BIT(1), 0); 249 249 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[] = { 251 258 CCU_PARENT_HW(pll1_d384_6p4), 252 259 CCU_PARENT_HW(pll1_d192_12p8), 253 260 CCU_PARENT_HW(pll1_d96_25p6), ··· 262 255 CCU_PARENT_HW(pll1_d768_3p2), 263 256 CCU_PARENT_HW(pll1_d1536_1p6), 264 257 CCU_PARENT_HW(pll1_d3072_0p8), 265 - CCU_PARENT_HW(i2s_bclk), 258 + CCU_PARENT_HW(sspa0_i2s_bclk), 266 259 }; 267 - CCU_MUX_GATE_DEFINE(sspa0_clk, sspa_parents, APBC_SSPA0_CLK_RST, 4, 3, BIT(1), 0); 268 - CCU_MUX_GATE_DEFINE(sspa1_clk, sspa_parents, APBC_SSPA1_CLK_RST, 4, 3, BIT(1), 0); 260 + CCU_MUX_GATE_DEFINE(sspa0_clk, sspa0_parents, APBC_SSPA0_CLK_RST, 4, 3, BIT(1), 0); 261 + 262 + static const struct clk_parent_data sspa1_parents[] = { 263 + CCU_PARENT_HW(pll1_d384_6p4), 264 + CCU_PARENT_HW(pll1_d192_12p8), 265 + CCU_PARENT_HW(pll1_d96_25p6), 266 + CCU_PARENT_HW(pll1_d48_51p2), 267 + CCU_PARENT_HW(pll1_d768_3p2), 268 + CCU_PARENT_HW(pll1_d1536_1p6), 269 + CCU_PARENT_HW(pll1_d3072_0p8), 270 + CCU_PARENT_HW(sspa1_i2s_bclk), 271 + }; 272 + CCU_MUX_GATE_DEFINE(sspa1_clk, sspa1_parents, APBC_SSPA1_CLK_RST, 4, 3, BIT(1), 0); 273 + 269 274 CCU_GATE_DEFINE(dro_clk, CCU_PARENT_HW(apb_clk), APBC_DRO_CLK_RST, BIT(1), 0); 270 275 CCU_GATE_DEFINE(ir_clk, CCU_PARENT_HW(apb_clk), APBC_IR_CLK_RST, BIT(1), 0); 271 276 CCU_GATE_DEFINE(tsen_clk, CCU_PARENT_HW(apb_clk), APBC_TSEN_CLK_RST, BIT(1), 0); ··· 884 865 [CLK_SSPA1_BUS] = &sspa1_bus_clk.common.hw, 885 866 [CLK_TSEN_BUS] = &tsen_bus_clk.common.hw, 886 867 [CLK_IPC_AP2AUD_BUS] = &ipc_ap2aud_bus_clk.common.hw, 868 + [CLK_SSPA0_I2S_BCLK] = &sspa0_i2s_bclk.common.hw, 869 + [CLK_SSPA1_I2S_BCLK] = &sspa1_i2s_bclk.common.hw, 887 870 }; 888 871 889 872 static const struct spacemit_ccu_data k1_ccu_apbc_data = {