ASoC: pcm512x: Fix not setting word length if DAIFMT_CBS_CFS
In `pcm512x_hw_params()`, the following switch-case: ~~~~ switch (pcm512x->fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: ~~~~ returns 0, which was preventing word length from being written into codecs register. Fixed by writing it into register before checking `SND_SOC_DAIFMT_MASTER_MASK`. Tested with Raspberry Pi + sound card `hifiberry_dacplus` in CBS_CFS format Signed-off-by: Kirill Marinushkin <kmarinushkin@birdec.com> Cc: Mark Brown <broonie@kernel.org> Cc: Takashi Iwai <tiwai@suse.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Matthias Reichl <hias@horus.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Link: https://lore.kernel.org/r/20201115122306.18164-2-kmarinushkin@birdec.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
85288b3bf1
commit
6feaaa7c19
|
@ -1195,6 +1195,13 @@ static int pcm512x_hw_params(struct snd_pcm_substream *substream,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ret = regmap_update_bits(pcm512x->regmap, PCM512x_I2S_1,
|
||||||
|
PCM512x_ALEN, alen);
|
||||||
|
if (ret != 0) {
|
||||||
|
dev_err(component->dev, "Failed to set frame size: %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
switch (pcm512x->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
switch (pcm512x->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||||
case SND_SOC_DAIFMT_CBS_CFS:
|
case SND_SOC_DAIFMT_CBS_CFS:
|
||||||
ret = regmap_update_bits(pcm512x->regmap,
|
ret = regmap_update_bits(pcm512x->regmap,
|
||||||
|
@ -1229,13 +1236,6 @@ static int pcm512x_hw_params(struct snd_pcm_substream *substream,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = regmap_update_bits(pcm512x->regmap, PCM512x_I2S_1,
|
|
||||||
PCM512x_ALEN, alen);
|
|
||||||
if (ret != 0) {
|
|
||||||
dev_err(component->dev, "Failed to set frame size: %d\n", ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pcm512x->pll_out) {
|
if (pcm512x->pll_out) {
|
||||||
ret = regmap_write(pcm512x->regmap, PCM512x_FLEX_A, 0x11);
|
ret = regmap_write(pcm512x->regmap, PCM512x_FLEX_A, 0x11);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
|
|
Loading…
Reference in a new issue