| Message ID | 20210916151806.20756-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c42dd7bfbcab002b67653eaf3b95358ad2ae29f |
| Headers | show |
| Series | [1/6] ASoC: adau1372: Update to modern clocking terminology | expand |
On Thu, 16 Sep 2021 16:18:01 +0100, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the adau1372 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/6] ASoC: adau1372: Update to modern clocking terminology commit: 9c42dd7bfbcab002b67653eaf3b95358ad2ae29f [2/6] ASoC: adau1373: Update to modern clocking terminology commit: 829fddb1f6863c323bad354afa708ecad180ac39 [3/6] ASoC: adau1701: Update to modern clocking terminology commit: 33ff453907ee1d92e43108a0f18853f59a14d896 [4/6] ASoC: adau17x1: Update to modern clocking terminology commit: a41a008fe8229dfefb069cc6121a81982d164b87 [5/6] ASoC: adau1977: Update to modern clocking terminology commit: 21b686e0bf439de97dab5c78f2e07c4cb361ec26 [6/6] ASoC: adav80x: Update to modern clocking terminology commit: 9943ab72fd37062a850a4a58eac2c74269e28432 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/adau1372.c b/sound/soc/codecs/adau1372.c index 6811a8b3866d..1faa4c426365 100644 --- a/sound/soc/codecs/adau1372.c +++ b/sound/soc/codecs/adau1372.c @@ -30,7 +30,7 @@ struct adau1372 { void (*switch_mode)(struct device *dev); bool use_pll; bool enabled; - bool master; + bool clock_provider; struct snd_pcm_hw_constraint_list rate_constraints; unsigned int slot_width; @@ -578,13 +578,13 @@ static int adau1372_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) unsigned int sai0 = 0, sai1 = 0; bool invert_lrclk = false; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - adau1372->master = true; + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + adau1372->clock_provider = true; sai1 |= ADAU1372_SAI1_MS; break; - case SND_SOC_DAIFMT_CBS_CFS: - adau1372->master = false; + case SND_SOC_DAIFMT_CBC_CFC: + adau1372->clock_provider = false; break; default: return -EINVAL; @@ -714,7 +714,7 @@ static int adau1372_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, break; case 4: sai0 = ADAU1372_SAI0_SAI_TDM4; - if (adau1372->master) + if (adau1372->clock_provider) adau1372->rate_constraints.mask = ADAU1372_RATE_MASK_TDM4_MASTER; else adau1372->rate_constraints.mask = ADAU1372_RATE_MASK_TDM4;
As part of moving to remove the old style defines for the bus clocks update the adau1372 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/adau1372.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)