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

Commit 57669eaa authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/davinci' into asoc-linus

parents 37c1b927 df4a4eec

sound/soc/davinci/davinci-mcasp.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -503,7 +503,10 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);

		mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);

		mcasp_set_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE);

		mcasp_set_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE);





		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, ACLKX | AFSX);

		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG,

				ACLKX | ACLKR);

		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG,

				AFSX | AFSR);

		break;

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

	case SND_SOC_DAIFMT_CBM_CFS:

		/* codec is clock master and frame slave */

		/* codec is clock master and frame slave */
@@ -563,7 +566,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		mcasp_set_bits(base + DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);

		mcasp_set_bits(base + DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);

		mcasp_clr_bits(base + DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);

		mcasp_clr_bits(base + DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);





		mcasp_clr_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);

		mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);

		mcasp_clr_bits(base + DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);

		mcasp_clr_bits(base + DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);

		break;

		break;