OSDN Git Service

ASoC: adau1372: Update to modern clocking terminology
authorMark Brown <broonie@kernel.org>
Thu, 16 Sep 2021 15:18:01 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 27 Sep 2021 12:00:56 +0000 (13:00 +0100)
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>
Link: https://lore.kernel.org/r/20210916151806.20756-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/adau1372.c

index 6811a8b..1faa4c4 100644 (file)
@@ -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;