ASoC: rsnd: fixup SND_SOC_DAIFMT_xB_xF behavior
Subsystems (3)
PATCH 1/1 ASoC: rsnd: fixup SND_SOC_DAIFMT_xB_xF behavior
From: Kuninori Morimoto <[email protected]>
In current R-Car rsnd driver,
the SND_SOC_DAIFMT_xB_xF flags are used to HW default behavior, but, it should be used to specific format.
The waveforms of LEFT_J/RIGHT_J format with SND_SOC_DAIFMT_NB_NF flag will be
started from "falling edge" without this patch.
But, it should be started from "rising edge".
--- sound/soc/sh/rcar/core.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-)
sound/soc/sh/rcar/core.c +22 -21
@@ -624,40 +624,41 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)return -EINVAL ; } -/* set clock inversion */ -switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { -case SND_SOC_DAIFMT_NB_IF : - rdai->bit_clk_inv =0 ; - rdai->frm_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_IB_NF : - rdai->bit_clk_inv =1 ; - rdai->frm_clk_inv =0 ; -break ; -case SND_SOC_DAIFMT_IB_IF : - rdai->bit_clk_inv =1 ; - rdai->frm_clk_inv =1 ; -break ; -case SND_SOC_DAIFMT_NB_NF : -default : - rdai->bit_clk_inv =0 ; - rdai->frm_clk_inv =0 ; -break ; - } -/* set format */ switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) {case SND_SOC_DAIFMT_I2S : rdai->sys_delay =0 ; rdai->data_alignment =0 ; + rdai->frm_clk_inv =0 ;break ;case SND_SOC_DAIFMT_LEFT_J : rdai->sys_delay =1 ; rdai->data_alignment =0 ; + rdai->frm_clk_inv =1 ;break ;case SND_SOC_DAIFMT_RIGHT_J : rdai->sys_delay =1 ; rdai->data_alignment =1 ; + rdai->frm_clk_inv =1 ; +break ; + } + +/* set clock inversion */ +switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { +case SND_SOC_DAIFMT_NB_IF : + rdai->bit_clk_inv = rdai->bit_clk_inv; + rdai->frm_clk_inv = !rdai->frm_clk_inv; +break ; +case SND_SOC_DAIFMT_IB_NF : + rdai->bit_clk_inv = !rdai->bit_clk_inv; + rdai->frm_clk_inv = rdai->frm_clk_inv; +break ; +case SND_SOC_DAIFMT_IB_IF : + rdai->bit_clk_inv = !rdai->bit_clk_inv; + rdai->frm_clk_inv = !rdai->frm_clk_inv; +break ; +case SND_SOC_DAIFMT_NB_NF : +default :break ; }
Signature · 1 line
1.7.9.5
Quoted 5 lines · Kuninori Morimoto
From: Kuninori Morimoto <[email protected]>
In current R-Car rsnd driver,
theSND_SOC_DAIFMT_xB_xFflags are used to HW default behavior, but, it should be used to specific format.
Applied, thanks. I guess some of the machine drivers probably need updates after this change?
Hi Mark
Quoted 6 lines
Quoted 3 lines
In current R-Car rsnd driver,
theSND_SOC_DAIFMT_xB_xFflags are used to HW default behavior, but, it should be used to specific format.Applied, thanks. I guess some of the machine drivers probably need updates after this change?
There is no update patch for machine side.
Existing code was fixed by this patch.