Skip to content

Commit 5bebbfd

Browse files
SenWang125broonie
authored andcommitted
ASoC: ti: davinci-mcasp: extract mcasp_is_auxclk_enabled() helper
Move the AUXCLK-enabled check out of davinci_mcasp_calc_clk_div() into a reusable helper. No functional change. Signed-off-by: Sen Wang <sen@ti.com> Link: https://patch.msgid.link/20260305195825.9998-2-sen@ti.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 1f318b9 commit 5bebbfd

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

sound/soc/ti/davinci-mcasp.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,14 @@ static inline unsigned int mcasp_get_auxclk_fs_ratio(struct davinci_mcasp *mcasp
274274
mcasp->auxclk_fs_ratio_tx : mcasp->auxclk_fs_ratio_rx;
275275
}
276276

277+
static inline bool mcasp_is_auxclk_enabled(struct davinci_mcasp *mcasp, int stream)
278+
{
279+
if (mcasp->async_mode && stream == SNDRV_PCM_STREAM_CAPTURE)
280+
return mcasp_get_reg(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG) & AHCLKRE;
281+
282+
return mcasp_get_reg(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG) & AHCLKXE;
283+
}
284+
277285
static void mcasp_start_rx(struct davinci_mcasp *mcasp)
278286
{
279287
if (mcasp->rxnumevt) { /* enable FIFO */
@@ -1337,16 +1345,15 @@ static int davinci_mcasp_calc_clk_div(struct davinci_mcasp *mcasp,
13371345
int bclk_div_id, auxclk_div_id;
13381346
bool auxclk_enabled;
13391347

1348+
auxclk_enabled = mcasp_is_auxclk_enabled(mcasp, stream);
1349+
13401350
if (mcasp->async_mode && stream == SNDRV_PCM_STREAM_CAPTURE) {
1341-
auxclk_enabled = mcasp_get_reg(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG) & AHCLKRE;
13421351
bclk_div_id = MCASP_CLKDIV_BCLK_RXONLY;
13431352
auxclk_div_id = MCASP_CLKDIV_AUXCLK_RXONLY;
13441353
} else if (mcasp->async_mode && stream == SNDRV_PCM_STREAM_PLAYBACK) {
1345-
auxclk_enabled = mcasp_get_reg(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG) & AHCLKXE;
13461354
bclk_div_id = MCASP_CLKDIV_BCLK_TXONLY;
13471355
auxclk_div_id = MCASP_CLKDIV_AUXCLK_TXONLY;
13481356
} else {
1349-
auxclk_enabled = mcasp_get_reg(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG) & AHCLKXE;
13501357
bclk_div_id = MCASP_CLKDIV_BCLK;
13511358
auxclk_div_id = MCASP_CLKDIV_AUXCLK;
13521359
}

0 commit comments

Comments
 (0)