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

Commit f12f5c84 authored Jan 26, 2017 by Pierre-Louis Bossart Committed by Mark Brown Jan 31, 2017

ASoC: Intel: atom: fix frame polarity

The current frame sync polarity definitions are inconsistent in the
Atom/DPCM driver, fix to align with regular ASoC definitions and
update code in platform and machine drivers for RT5640 and RT5651.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 3639ac1c

sound/soc/intel/atom/sst-atom-controls.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -801,13 +801,11 @@ static int sst_get_frame_sync_polarity(struct snd_soc_dai *dai,

		switch (format) {
		case SND_SOC_DAIFMT_NB_NF:
		return SSP_FS_ACTIVE_LOW;
		case SND_SOC_DAIFMT_NB_IF:
		case SND_SOC_DAIFMT_IB_NF:
		return SSP_FS_ACTIVE_HIGH;
		case SND_SOC_DAIFMT_NB_IF:
		case SND_SOC_DAIFMT_IB_IF:
		return SSP_FS_ACTIVE_LOW;
		case SND_SOC_DAIFMT_IB_NF:
		return SSP_FS_ACTIVE_HIGH;
		default:
		dev_err(dai->dev, "Invalid frame sync polarity %d\n", format);
		}

sound/soc/intel/boards/bytcr_rt5640.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -546,7 +546,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,
		*/
		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
		SND_SOC_DAIFMT_I2S \|
		SND_SOC_DAIFMT_NB_IF \|
		SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBS_CFS
		);
		if (ret < 0) {
		@@ -572,7 +572,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,
		*/
		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
		SND_SOC_DAIFMT_I2S \|
		SND_SOC_DAIFMT_NB_IF \|
		SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBS_CFS
		);
		if (ret < 0) {

sound/soc/intel/boards/bytcr_rt5651.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd,
		*/
		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
		SND_SOC_DAIFMT_I2S \|
		SND_SOC_DAIFMT_NB_IF \|
		SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBS_CFS
		);