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

Commit 9595c8f0 authored by Ben Gardiner's avatar Ben Gardiner Committed by Mark Brown
Browse files

davinci-mcasp: use bitfield definitions for PDIR 



The current driver creates value for set/clr of PDIR using (x<<26) instead
of the #defines that are convieniently made available.

Update the driver to use the bitfield definitions of PDIR. There is no
functional change introduced by this patch.

Signed-off-by: default avatarBen Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: default avatarJames Nuss <jamesnuss@nanometrics.ca>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 049cfaaa

sound/soc/davinci/davinci-mcasp.c

+6 −3
Original line number Diff line number Diff line
@@ -434,7 +434,8 @@ 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_RXFMCTL_REG, AFSRE);



		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, (0x7 << 26));

		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG,

				ACLKX | AHCLKX | AFSX);

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

		/* codec is clock master and frame slave */
@@ -444,7 +445,8 @@ 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_RXFMCTL_REG, AFSRE);



		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, (0x2d << 26));

		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG,

				ACLKX | AFSX | ACLKR | AFSR);

		break;

	case SND_SOC_DAIFMT_CBM_CFM:

		/* codec is clock and frame master */
@@ -454,7 +456,8 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		mcasp_clr_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);

		mcasp_clr_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE);



		mcasp_clr_bits(base + DAVINCI_MCASP_PDIR_REG, (0x3f << 26));

		mcasp_clr_bits(base + DAVINCI_MCASP_PDIR_REG,

				ACLKX | AHCLKX | AFSX | ACLKR | AHCLKR | AFSR);

		break;



	default: