| Message ID | 20220223003046.1697784-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7effe2cde907a5517489bf3927df7822c3acb13c |
| Headers | show |
| Series | ASoC: twl4030: Use modern ASoC DAI format terminology | expand |
On 23/02/2022 02:30, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the twl4030 driver to use more modern terminology for clocking. Thanks Mark! Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> > > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > sound/soc/codecs/twl4030.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c > index e059711ff293..0ba3546ef870 100644 > --- a/sound/soc/codecs/twl4030.c > +++ b/sound/soc/codecs/twl4030.c > @@ -1840,13 +1840,12 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) > old_format = twl4030_read(component, TWL4030_REG_AUDIO_IF); > format = old_format; > > - /* set master/slave audio interface */ > - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { > - case SND_SOC_DAIFMT_CBM_CFM: > + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { > + case SND_SOC_DAIFMT_CBP_CFP: > format &= ~(TWL4030_AIF_SLAVE_EN); > format &= ~(TWL4030_CLK256FS_EN); > break; > - case SND_SOC_DAIFMT_CBS_CFS: > + case SND_SOC_DAIFMT_CBC_CFC: > format |= TWL4030_AIF_SLAVE_EN; > format |= TWL4030_CLK256FS_EN; > break; > @@ -2038,9 +2037,8 @@ static int twl4030_voice_set_dai_fmt(struct snd_soc_dai *codec_dai, > old_format = twl4030_read(component, TWL4030_REG_VOICE_IF); > format = old_format; > > - /* set master/slave audio interface */ > - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { > - case SND_SOC_DAIFMT_CBM_CFM: > + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { > + case SND_SOC_DAIFMT_CBP_CFP: > format &= ~(TWL4030_VIF_SLAVE_EN); > break; > case SND_SOC_DAIFMT_CBS_CFS:
On Wed, 23 Feb 2022 00:30:46 +0000, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the twl4030 driver to use more modern terminology for clocking. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: twl4030: Use modern ASoC DAI format terminology commit: 7effe2cde907a5517489bf3927df7822c3acb13c All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index e059711ff293..0ba3546ef870 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -1840,13 +1840,12 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) old_format = twl4030_read(component, TWL4030_REG_AUDIO_IF); format = old_format; - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: format &= ~(TWL4030_AIF_SLAVE_EN); format &= ~(TWL4030_CLK256FS_EN); break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: format |= TWL4030_AIF_SLAVE_EN; format |= TWL4030_CLK256FS_EN; break; @@ -2038,9 +2037,8 @@ static int twl4030_voice_set_dai_fmt(struct snd_soc_dai *codec_dai, old_format = twl4030_read(component, TWL4030_REG_VOICE_IF); format = old_format; - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: format &= ~(TWL4030_VIF_SLAVE_EN); break; case SND_SOC_DAIFMT_CBS_CFS:
As part of moving to remove the old style defines for the bus clocks update the twl4030 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/twl4030.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)