| Message ID | 20220223014846.2765382-1-broonie@kernel.org |
|---|---|
| State | Accepted |
| Commit | 1900cb5375c3e95382601deed6ef95fb7b121a2e |
| Headers | show |
| Series | [1/4] ASoC: pcm1681: Use modern ASoC DAI format terminology | expand |
On Wed, 23 Feb 2022 01:48:43 +0000, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the pcm1681 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/4] ASoC: pcm1681: Use modern ASoC DAI format terminology commit: 1900cb5375c3e95382601deed6ef95fb7b121a2e [2/4] ASoC: pcm186x: Use modern ASoC DAI format terminology commit: 765e30ac665777d7d7ad4fe75490138a85931d3a [3/4] ASoC: pcm3168a: Use modern ASoC DAI format terminology commit: 9231bb1b25348bff738181e4614c997bcdeba7cf [4/4] ASoC: pcm512x: Use modern ASoC DAI format terminology commit: e0dab08973c890d554e14089b756e81b50ed8af4 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/pcm1681.c b/sound/soc/codecs/pcm1681.c index 5b78e9299c95..9eb65f94fc4d 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c @@ -136,8 +136,8 @@ static int pcm1681_set_dai_fmt(struct snd_soc_dai *codec_dai, struct snd_soc_component *component = codec_dai->component; struct pcm1681_private *priv = snd_soc_component_get_drvdata(component); - /* The PCM1681 can only be slave to all clocks */ - if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) { + /* The PCM1681 can only be consumer to all clocks */ + if ((format & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_CBC_CFC) { dev_err(component->dev, "Invalid clocking mode\n"); return -EINVAL; }
As part of moving to remove the old style defines for the bus clocks update the pcm1681 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/pcm1681.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)