Commit 4cb83470 authored by Jerome Brunet's avatar Jerome Brunet
Browse files

clk: meson: axg-audio: add sm1 earcrx clocks 



Add CMDC, DMAC and peripheral clocks for the eARC RX device found on the
sm1 SoC family

Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20240719093934.3985139-4-jbrunet@baylibre.com


Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
parent dd8ab39a

drivers/clk/meson/axg-audio.c

+31 −1
Original line number Diff line number Diff line
@@ -753,6 +753,9 @@ static struct clk_regmap toddr_d = 
	AUD_PCLK_GATE(toddr_d, AUDIO_CLK_GATE_EN1, 1);

static struct clk_regmap loopback_b =

	AUD_PCLK_GATE(loopback_b, AUDIO_CLK_GATE_EN1, 2);

static struct clk_regmap earcrx =

	AUD_PCLK_GATE(earcrx, AUDIO_CLK_GATE_EN1, 6);





static struct clk_regmap sm1_mst_a_mclk_sel =

	AUD_MST_MCLK_MUX(mst_a_mclk, AUDIO_SM1_MCLK_A_CTRL);
@@ -766,6 +769,10 @@ static struct clk_regmap sm1_mst_e_mclk_sel = 
	AUD_MST_MCLK_MUX(mst_e_mclk, AUDIO_SM1_MCLK_E_CTRL);

static struct clk_regmap sm1_mst_f_mclk_sel =

	AUD_MST_MCLK_MUX(mst_f_mclk, AUDIO_SM1_MCLK_F_CTRL);

static struct clk_regmap sm1_earcrx_cmdc_clk_sel =

	AUD_MST_MCLK_MUX(earcrx_cmdc_clk, AUDIO_EARCRX_CMDC_CLK_CTRL);

static struct clk_regmap sm1_earcrx_dmac_clk_sel =

	AUD_MST_MCLK_MUX(earcrx_dmac_clk, AUDIO_EARCRX_DMAC_CLK_CTRL);



static struct clk_regmap sm1_mst_a_mclk_div =

	AUD_MST_MCLK_DIV(mst_a_mclk, AUDIO_SM1_MCLK_A_CTRL);
@@ -779,6 +786,11 @@ static struct clk_regmap sm1_mst_e_mclk_div = 
	AUD_MST_MCLK_DIV(mst_e_mclk, AUDIO_SM1_MCLK_E_CTRL);

static struct clk_regmap sm1_mst_f_mclk_div =

	AUD_MST_MCLK_DIV(mst_f_mclk, AUDIO_SM1_MCLK_F_CTRL);

static struct clk_regmap sm1_earcrx_cmdc_clk_div =

	AUD_MST_MCLK_DIV(earcrx_cmdc_clk, AUDIO_EARCRX_CMDC_CLK_CTRL);

static struct clk_regmap sm1_earcrx_dmac_clk_div =

	AUD_MST_MCLK_DIV(earcrx_dmac_clk, AUDIO_EARCRX_DMAC_CLK_CTRL);





static struct clk_regmap sm1_mst_a_mclk =

	AUD_MST_MCLK_GATE(mst_a_mclk, AUDIO_SM1_MCLK_A_CTRL);
@@ -792,6 +804,10 @@ static struct clk_regmap sm1_mst_e_mclk = 
	AUD_MST_MCLK_GATE(mst_e_mclk, AUDIO_SM1_MCLK_E_CTRL);

static struct clk_regmap sm1_mst_f_mclk =

	AUD_MST_MCLK_GATE(mst_f_mclk, AUDIO_SM1_MCLK_F_CTRL);

static struct clk_regmap sm1_earcrx_cmdc_clk =

	AUD_MST_MCLK_GATE(earcrx_cmdc_clk, AUDIO_EARCRX_CMDC_CLK_CTRL);

static struct clk_regmap sm1_earcrx_dmac_clk =

	AUD_MST_MCLK_GATE(earcrx_dmac_clk, AUDIO_EARCRX_DMAC_CLK_CTRL);



static struct clk_regmap sm1_tdm_mclk_pad_0 = AUD_TDM_PAD_CTRL(

	tdm_mclk_pad_0, AUDIO_SM1_MST_PAD_CTRL0, 0, mclk_pad_ctrl_parent_data);
@@ -1232,6 +1248,13 @@ static struct clk_hw *sm1_audio_hw_clks[] = { 
	[AUD_CLKID_SYSCLK_A_EN]		= &sm1_sysclk_a_en.hw,

	[AUD_CLKID_SYSCLK_B_DIV]	= &sm1_sysclk_b_div.hw,

	[AUD_CLKID_SYSCLK_B_EN]		= &sm1_sysclk_b_en.hw,

	[AUD_CLKID_EARCRX]		= &earcrx.hw,

	[AUD_CLKID_EARCRX_CMDC_SEL]	= &sm1_earcrx_cmdc_clk_sel.hw,

	[AUD_CLKID_EARCRX_CMDC_DIV]	= &sm1_earcrx_cmdc_clk_div.hw,

	[AUD_CLKID_EARCRX_CMDC]		= &sm1_earcrx_cmdc_clk.hw,

	[AUD_CLKID_EARCRX_DMAC_SEL]	= &sm1_earcrx_dmac_clk_sel.hw,

	[AUD_CLKID_EARCRX_DMAC_DIV]	= &sm1_earcrx_dmac_clk_div.hw,

	[AUD_CLKID_EARCRX_DMAC]		= &sm1_earcrx_dmac_clk.hw,

};
@@ -1646,6 +1669,13 @@ static struct clk_regmap *const sm1_clk_regmaps[] = { 
	&sm1_sysclk_a_en,

	&sm1_sysclk_b_div,

	&sm1_sysclk_b_en,

	&earcrx,

	&sm1_earcrx_cmdc_clk_sel,

	&sm1_earcrx_cmdc_clk_div,

	&sm1_earcrx_cmdc_clk,

	&sm1_earcrx_dmac_clk_sel,

	&sm1_earcrx_dmac_clk_div,

	&sm1_earcrx_dmac_clk,

};



struct axg_audio_reset_data {
@@ -1853,7 +1883,7 @@ static const struct audioclk_data sm1_audioclk_data = { 
	},

	.reset_offset = AUDIO_SM1_SW_RESET0,

	.reset_num = 39,

	.max_register = AUDIO_CLK_SPDIFOUT_B_CTRL,

	.max_register = AUDIO_EARCRX_DMAC_CLK_CTRL,

};



static const struct of_device_id clkc_match_table[] = {

drivers/clk/meson/axg-audio.h

+2 −0
Original line number Diff line number Diff line
@@ -64,5 +64,7 @@ 
#define AUDIO_SM1_SW_RESET1	0x02C

#define AUDIO_CLK81_CTRL	0x030

#define AUDIO_CLK81_EN		0x034

#define AUDIO_EARCRX_CMDC_CLK_CTRL	0x0D0

#define AUDIO_EARCRX_DMAC_CLK_CTRL	0x0D4



#endif /*__AXG_AUDIO_CLKC_H */