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

Commit 9e031624 authored by Troy Kisky's avatar Troy Kisky Committed by Mark Brown
Browse files

ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai 



Fix the meaning of SND_SOC_DAIFMT_NB_NF to match that
used in the codec.

Signed-off-by: default avatarTroy Kisky <troy.kisky@boundarydevices.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a24f4f68

sound/soc/davinci/davinci-evm.c

+4 −6
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 


#define EVM_CODEC_CLOCK 22579200



#define AUDIO_FORMAT (SND_SOC_DAIFMT_I2S | \

		SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_NF)

static int evm_hw_params(struct snd_pcm_substream *substream,

			 struct snd_pcm_hw_params *params)

{
@@ -37,16 +39,12 @@ static int evm_hw_params(struct snd_pcm_substream *substream, 
	int ret = 0;



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

					SND_SOC_DAIFMT_CBM_CFM |

					SND_SOC_DAIFMT_NB_NF);

	ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

					SND_SOC_DAIFMT_CBM_CFM |

				       SND_SOC_DAIFMT_IB_NF);

	ret = snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT);

	if (ret < 0)

		return ret;

sound/soc/davinci/davinci-i2s.c

+4 −4
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	}



	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

	case SND_SOC_DAIFMT_IB_NF:

	case SND_SOC_DAIFMT_NB_NF:

		/* CLKRP Receive clock polarity,

		 *	1 - sampled on rising edge of CLKR

		 *	valid on rising edge
@@ -283,7 +283,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		 */

		pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP);

		break;

	case SND_SOC_DAIFMT_NB_IF:

	case SND_SOC_DAIFMT_IB_IF:

		/* CLKRP Receive clock polarity,

		 *	0 - sampled on falling edge of CLKR

		 *	valid on falling edge
@@ -295,7 +295,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		 */

		pcr |= (DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP);

		break;

	case SND_SOC_DAIFMT_IB_IF:

	case SND_SOC_DAIFMT_NB_IF:

		/* CLKRP Receive clock polarity,

		 *	1 - sampled on rising edge of CLKR

		 *	valid on rising edge
@@ -308,7 +308,7 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP |

			DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP);

		break;

	case SND_SOC_DAIFMT_NB_NF:

	case SND_SOC_DAIFMT_IB_NF:

		/* CLKRP Receive clock polarity,

		 *	0 - sampled on falling edge of CLKR

		 *	valid on falling edge