| Message ID | 20220602125812.3551947-1-broonie@kernel.org |
|---|---|
| State | Accepted |
| Commit | 8366d8ca0f7805be6cffe1e242822565aed509ae |
| Headers | show |
| Series | ASoC: max9860: Use modern ASoC DAI format terminology | expand |
2022-06-02 at 14:58, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the max9860 driver to use more modern terminology for clocking. > > Signed-off-by: Mark Brown <broonie@kernel.org> Acked-by: Peter Rosin <peda@axentia.se> Cheers, Peter
On Thu, 2 Jun 2022 14:58:12 +0200, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the max9860 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: max9860: Use modern ASoC DAI format terminology commit: 8366d8ca0f7805be6cffe1e242822565aed509ae 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/max9860.c b/sound/soc/codecs/max9860.c index 82f20a8e27ad..a1d0179e12c7 100644 --- a/sound/soc/codecs/max9860.c +++ b/sound/soc/codecs/max9860.c @@ -448,9 +448,9 @@ static int max9860_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) struct snd_soc_component *component = dai->component; struct max9860_priv *max9860 = snd_soc_component_get_drvdata(component); - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + case SND_SOC_DAIFMT_CBC_CFC: max9860->fmt = fmt; return 0;
As part of moving to remove the old style defines for the bus clocks update the max9860 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/max9860.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)