| Message ID | 20220223001636.1321505-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ca7176f695cfa7ddb8498b5114f47e7a443f97bb |
| Headers | show |
| Series | ASoC: ml26124: Use modern ASoC DAI format terminology | expand |
On Wed, 23 Feb 2022 00:16:36 +0000, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the ml26124 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: ml26124: Use modern ASoC DAI format terminology commit: ca7176f695cfa7ddb8498b5114f47e7a443f97bb 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/ml26124.c b/sound/soc/codecs/ml26124.c index 4d7c0be2a4aa..0823527e4a75 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c @@ -402,12 +402,11 @@ static int ml26124_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned char mode; struct snd_soc_component *component = codec_dai->component; - /* 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: mode = 1; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: mode = 0; break; default:
As part of moving to remove the old style defines for the bus clocks update the ml26124 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/ml26124.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)