Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 2d534113 authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Mark Brown
Browse files

ASoC: cirrus: i2s: Fix LRCLK configuration 



The bit responsible for LRCLK polarity is i2s_tlrs (0), not i2s_trel (2)
(refer to "EP93xx User's Guide").

Previously card drivers which specified SND_SOC_DAIFMT_NB_IF actually got
SND_SOC_DAIFMT_NB_NF, an adaptation is necessary to retain the old
behavior.

Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 5845e615

sound/soc/cirrus/edb93xx.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static struct snd_soc_dai_link edb93xx_dai = { 
	.cpu_dai_name	= "ep93xx-i2s",

	.codec_name	= "spi0.0",

	.codec_dai_name	= "cs4271-hifi",

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBS_CFS,

	.ops		= &edb93xx_ops,

};

sound/soc/cirrus/ep93xx-i2s.c

+4 −4
Original line number Diff line number Diff line
@@ -213,24 +213,24 @@ static int ep93xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

	case SND_SOC_DAIFMT_NB_NF:

		/* Negative bit clock, lrclk low on left word */

		clk_cfg &= ~(EP93XX_I2S_CLKCFG_CKP | EP93XX_I2S_CLKCFG_REL);

		clk_cfg &= ~(EP93XX_I2S_CLKCFG_CKP | EP93XX_I2S_CLKCFG_LRS);

		break;



	case SND_SOC_DAIFMT_NB_IF:

		/* Negative bit clock, lrclk low on right word */

		clk_cfg &= ~EP93XX_I2S_CLKCFG_CKP;

		clk_cfg |= EP93XX_I2S_CLKCFG_REL;

		clk_cfg |= EP93XX_I2S_CLKCFG_LRS;

		break;



	case SND_SOC_DAIFMT_IB_NF:

		/* Positive bit clock, lrclk low on left word */

		clk_cfg |= EP93XX_I2S_CLKCFG_CKP;

		clk_cfg &= ~EP93XX_I2S_CLKCFG_REL;

		clk_cfg &= ~EP93XX_I2S_CLKCFG_LRS;

		break;



	case SND_SOC_DAIFMT_IB_IF:

		/* Positive bit clock, lrclk low on right word */

		clk_cfg |= EP93XX_I2S_CLKCFG_CKP | EP93XX_I2S_CLKCFG_REL;

		clk_cfg |= EP93XX_I2S_CLKCFG_CKP | EP93XX_I2S_CLKCFG_LRS;

		break;

	}

sound/soc/cirrus/snappercl15.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static struct snd_soc_dai_link snappercl15_dai = { 
	.codec_dai_name	= "tlv320aic23-hifi",

	.codec_name	= "tlv320aic23-codec.0-001a",

	.platform_name	= "ep93xx-i2s",

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBS_CFS,

	.ops		= &snappercl15_ops,

};