|
@@ -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:
|