| Message ID | 20220223003810.1947495-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c9fa2165c0b410f195ed2bd15c07a4baa3bca482 |
| Headers | show |
| Series | ASoC: wl1273: Use modern ASoC DAI format terminology | expand |
On Wed, 23 Feb 2022 00:38:10 +0000, Mark Brown wrote: > As part of moving to remove the old style defines for the bus clocks update > the wl1273 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: wl1273: Use modern ASoC DAI format terminology commit: c9fa2165c0b410f195ed2bd15c07a4baa3bca482 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/wl1273.c b/sound/soc/codecs/wl1273.c index d8ced4559bf2..02232f64110e 100644 --- a/sound/soc/codecs/wl1273.c +++ b/sound/soc/codecs/wl1273.c @@ -414,13 +414,13 @@ int wl1273_get_format(struct snd_soc_component *component, unsigned int *fmt) case WL1273_MODE_FM_TX: *fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBM_CFM; + SND_SOC_DAIFMT_CBP_CFP; break; case WL1273_MODE_BT: *fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | - SND_SOC_DAIFMT_CBM_CFM; + SND_SOC_DAIFMT_CBP_CFP; break; default:
As part of moving to remove the old style defines for the bus clocks update the wl1273 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/wl1273.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)