On 23/02/2022 02:30, Mark Brown wrote:
> As part of moving to remove the old style defines for the bus clocks update
> the twl4030 driver to use more modern terminology for clocking.
Thanks Mark!
Acked-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
> sound/soc/codecs/twl4030.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> index e059711ff293..0ba3546ef870 100644
> --- a/sound/soc/codecs/twl4030.c
> +++ b/sound/soc/codecs/twl4030.c
> @@ -1840,13 +1840,12 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
> old_format = twl4030_read(component, TWL4030_REG_AUDIO_IF);
> format = old_format;
>
> - /* 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:
> format &= ~(TWL4030_AIF_SLAVE_EN);
> format &= ~(TWL4030_CLK256FS_EN);
> break;
> - case SND_SOC_DAIFMT_CBS_CFS:
> + case SND_SOC_DAIFMT_CBC_CFC:
> format |= TWL4030_AIF_SLAVE_EN;
> format |= TWL4030_CLK256FS_EN;
> break;
> @@ -2038,9 +2037,8 @@ static int twl4030_voice_set_dai_fmt(struct snd_soc_dai *codec_dai,
> old_format = twl4030_read(component, TWL4030_REG_VOICE_IF);
> format = old_format;
>
> - /* 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:
> format &= ~(TWL4030_VIF_SLAVE_EN);
> break;
> case SND_SOC_DAIFMT_CBS_CFS:
--
Péter
