Skip to content

Commit 016efca

Browse files
SenWang125broonie
authored andcommitted
ASoC: ti: davinci-mcasp: Streamline pdir behavior across rx & tx streams
Simplify the mcasp_set_clk_pdir caller convention in start/stop stream function, to make it so that set_clk_pdir gets called regardless when stream starts and also disables when stream ends. Functionality-wise, everything remains the same as the previously skipped calls are now either correctly configured (when McASP is SND_SOC_DAIFMT_BP_FC - pdir needs to be enabled) or called with a bitmask of zero (when McASP is SND_SOC_DAIFMT_BC_FC - pdir gets disabled). On brief regarding McASP Clock and Frame sync configurations, refer to [0]. [0]:TRM Section 12.1.1.4.2 https://www.ti.com/lit/ug/sprujd4a/sprujd4a.pdf Signed-off-by: Sen Wang <sen@ti.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> Tested-by: Paresh Bhagat <p-bhagat@ti.com> Link: https://patch.msgid.link/20260203003703.2334443-4-sen@ti.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e683cb0 commit 016efca

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

sound/soc/ti/davinci-mcasp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ static void mcasp_start_rx(struct davinci_mcasp *mcasp)
236236
if (mcasp_is_frame_producer(mcasp) && mcasp_is_synchronous(mcasp)) {
237237
mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLX_REG, TXHCLKRST);
238238
mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLX_REG, TXCLKRST);
239-
mcasp_set_clk_pdir(mcasp, true);
240239
}
240+
mcasp_set_clk_pdir(mcasp, true);
241241

242242
/* Activate serializer(s) */
243243
mcasp_set_reg(mcasp, DAVINCI_MCASP_RXSTAT_REG, 0xFFFFFFFF);
@@ -312,10 +312,10 @@ static void mcasp_stop_rx(struct davinci_mcasp *mcasp)
312312
* In synchronous mode stop the TX clocks if no other stream is
313313
* running
314314
*/
315-
if (mcasp_is_frame_producer(mcasp) && mcasp_is_synchronous(mcasp) && !mcasp->streams) {
315+
if (!mcasp->streams)
316316
mcasp_set_clk_pdir(mcasp, false);
317+
if (mcasp_is_frame_producer(mcasp) && mcasp_is_synchronous(mcasp) && !mcasp->streams)
317318
mcasp_set_reg(mcasp, DAVINCI_MCASP_GBLCTLX_REG, 0);
318-
}
319319

320320
mcasp_set_reg(mcasp, DAVINCI_MCASP_GBLCTLR_REG, 0);
321321
mcasp_set_reg(mcasp, DAVINCI_MCASP_RXSTAT_REG, 0xFFFFFFFF);
@@ -341,7 +341,7 @@ static void mcasp_stop_tx(struct davinci_mcasp *mcasp)
341341
*/
342342
if (mcasp_is_frame_producer(mcasp) && mcasp_is_synchronous(mcasp) && mcasp->streams)
343343
val = TXHCLKRST | TXCLKRST | TXFSRST;
344-
else
344+
if (!mcasp->streams)
345345
mcasp_set_clk_pdir(mcasp, false);
346346

347347

0 commit comments

Comments
 (0)