| Message ID | 20210921211040.11624-3-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/16] ASoC: eureka-tlv320: Update to modern clocking terminology | expand |
| Related | show |
On Tue, Sep 21, 2021 at 6:11 PM Mark Brown <broonie@kernel.org> wrote: > > As part of moving to remove the old style defines for the bus clocks update > the fsl-audmix driver to use more modern terminology for clocking. > > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > sound/soc/fsl/fsl_audmix.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c > index f931288e256c..db2dde597edc 100644 > --- a/sound/soc/fsl/fsl_audmix.c > +++ b/sound/soc/fsl/fsl_audmix.c > @@ -257,10 +257,10 @@ static int fsl_audmix_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) > return -EINVAL; > } > > - /* For playback the AUDMIX is slave, and for record is master */ > - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { > - case SND_SOC_DAIFMT_CBM_CFM: > - case SND_SOC_DAIFMT_CBS_CFS: > + /* For playback the AUDMIX is provider, and for record is consumer */ > + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { I think the comment should be the other way around: /* For playback the AUDMIX is consumer, and for record is provider */ Other than that, the series looks good.
On Tue, Sep 21, 2021 at 06:22:51PM -0300, Fabio Estevam wrote: > On Tue, Sep 21, 2021 at 6:11 PM Mark Brown <broonie@kernel.org> wrote: > > - /* For playback the AUDMIX is slave, and for record is master */ > > + /* For playback the AUDMIX is provider, and for record is consumer */ > I think the comment should be the other way around: > /* For playback the AUDMIX is consumer, and for record is provider */ > Other than that, the series looks good. Right, yes.
diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c index f931288e256c..db2dde597edc 100644 --- a/sound/soc/fsl/fsl_audmix.c +++ b/sound/soc/fsl/fsl_audmix.c @@ -257,10 +257,10 @@ static int fsl_audmix_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - /* For playback the AUDMIX is slave, and for record is master */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - case SND_SOC_DAIFMT_CBS_CFS: + /* For playback the AUDMIX is provider, and for record is consumer */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL;
As part of moving to remove the old style defines for the bus clocks update the fsl-audmix driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/fsl/fsl_audmix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)