aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunya Monden <[email protected]>2019-10-16 14:42:55 +0200
committerMark Brown <[email protected]>2019-10-18 18:08:34 +0100
commit22e58665a01006d05f0239621f7d41cacca96cc4 (patch)
tree4761b9ab14eebd0832230447c71cdd62c8a37de5
parentaf6219590b541418d3192e9bfa03989834ca0e78 (diff)
ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting
Unlike other format-related DAI parameters, rdai->bit_clk_inv flag is not properly re-initialized when setting format for new stream processing. The inversion, if requested, is then applied not to default, but to a previous value, which leads to SCKP bit in SSICR register being set incorrectly. Fix this by re-setting the flag to its initial value, determined by format. Fixes: 1a7889ca8aba3 ("ASoC: rsnd: fixup SND_SOC_DAIFMT_xB_xF behavior") Cc: Andrew Gabbasov <[email protected]> Cc: Jiada Wang <[email protected]> Cc: Timo Wischer <[email protected]> Cc: [email protected] # v3.17+ Signed-off-by: Junya Monden <[email protected]> Signed-off-by: Eugeniu Rosca <[email protected]> Acked-by: Kuninori Morimoto <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
-rw-r--r--sound/soc/sh/rcar/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index bda5b958d0dc..e9596c2096cd 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -761,6 +761,7 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
}
/* set format */
+ rdai->bit_clk_inv = 0;
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
rdai->sys_delay = 0;