ASoC: atmel: Convert to new style DAI format definitions

Convert the Atmel drivers to use the new style defines for clocking in DAI
formats.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Acked-by: Peter Rosin <peda@axentia.se>

diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c
index 6b3d9c05eaf2760080abf03a67e4fee981d10031..1934767690b511f71f32ed53d84ff0ffc6539ddb 100644 (file)
--- a/sound/soc/atmel/atmel-i2s.c
+++ b/sound/soc/atmel/atmel-i2s.c
@@ -342,8 +342,8 @@ static int atmel_i2s_hw_params(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
 
-       switch (dev->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (dev->fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC:
                /* codec is slave, so cpu is master */
                mr |= ATMEL_I2SC_MR_MODE_MASTER;
                ret = atmel_i2s_get_gck_param(dev, params_rate(params));
@@ -351,7 +351,7 @@ static int atmel_i2s_hw_params(struct snd_pcm_substream *substream,
                        return ret;
                break;
 
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_CBP_CFP:
                /* codec is master, so cpu is slave */
                mr |= ATMEL_I2SC_MR_MODE_SLAVE;
                dev->gck_param = NULL;

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 6a63e8797a0b6b5ecd58076dd1cd751dd81a1afd..26e2bc690d86eb3081fa5875d886cb6486da2bbf 100644 (file)
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -209,8 +209,8 @@ static int atmel_ssc_hw_rule_rate(struct snd_pcm_hw_params *params,
        if (frame_size < 0)
                return frame_size;
 
-       switch (ssc_p->daifmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFS:
+       switch (ssc_p->daifmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFC:
                if ((ssc_p->dir_mask & SSC_DIR_MASK_CAPTURE)
                    && ssc->clk_from_rk_pin)
                        /* Receiver Frame Synchro (i.e. capture)
@@ -220,7 +220,7 @@ static int atmel_ssc_hw_rule_rate(struct snd_pcm_hw_params *params,
                        mck_div = 3;
                break;
 
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_CBP_CFP:
                if ((ssc_p->dir_mask & SSC_DIR_MASK_PLAYBACK)
                    && !ssc->clk_from_rk_pin)
                        /* Transmit Frame Synchro (i.e. playback)
@@ -232,8 +232,8 @@ static int atmel_ssc_hw_rule_rate(struct snd_pcm_hw_params *params,
                break;
        }
 
-       switch (ssc_p->daifmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (ssc_p->daifmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC:
                r.num = ssc_p->mck_rate / mck_div / frame_size;
 
                ret = snd_interval_ratnum(i, 1, &r, &num, &den);
@@ -243,8 +243,8 @@ static int atmel_ssc_hw_rule_rate(struct snd_pcm_hw_params *params,
                }
                break;
 
-       case SND_SOC_DAIFMT_CBM_CFS:
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_CBP_CFC:
+       case SND_SOC_DAIFMT_CBP_CFP:
                t.min = 8000;
                t.max = ssc_p->mck_rate / mck_div / frame_size;
                t.openmin = t.openmax = 0;
@@ -429,9 +429,9 @@ static int atmel_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
 /* Is the cpu-dai master of the frame clock? */
 static int atmel_ssc_cfs(struct atmel_ssc_info *ssc_p)
 {
-       switch (ssc_p->daifmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFS:
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (ssc_p->daifmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFC:
+       case SND_SOC_DAIFMT_CBC_CFC:
                return 1;
        }
        return 0;
@@ -440,9 +440,9 @@ static int atmel_ssc_cfs(struct atmel_ssc_info *ssc_p)
 /* Is the cpu-dai master of the bit clock? */
 static int atmel_ssc_cbs(struct atmel_ssc_info *ssc_p)
 {
-       switch (ssc_p->daifmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFM:
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (ssc_p->daifmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFP:
+       case SND_SOC_DAIFMT_CBC_CFC:
                return 1;
        }
        return 0;

diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c
index 9e237580afa9fca3088d0ca742054cedcb436f12..9c974c4e187d2a8772a892a838b42f6ec1c0c61c 100644 (file)
--- a/sound/soc/atmel/atmel_wm8904.c
+++ b/sound/soc/atmel/atmel_wm8904.c
@@ -66,7 +66,7 @@ static struct snd_soc_dai_link atmel_asoc_wm8904_dailink = {
        .stream_name = "WM8904 PCM",
        .dai_fmt = SND_SOC_DAIFMT_I2S
                | SND_SOC_DAIFMT_NB_NF
-               | SND_SOC_DAIFMT_CBM_CFM,
+               | SND_SOC_DAIFMT_CBP_CFP,
        .ops = &atmel_asoc_wm8904_ops,
        SND_SOC_DAILINK_REG(pcm),
 };

diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c
index 8988f024a73220b878f5f14e0dae2aeeb9b8c416..6d1227a1d67b517b7800f2f051752ac29c309225 100644 (file)
--- a/sound/soc/atmel/mchp-i2s-mcc.c
+++ b/sound/soc/atmel/mchp-i2s-mcc.c
@@ -350,7 +350,7 @@ static int mchp_i2s_mcc_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                return -EINVAL;
 
        /* We can't generate only FSYNC */
-       if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFS)
+       if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) == SND_SOC_DAIFMT_CBP_CFC)
                return -EINVAL;
 
        /* We can only reconfigure the IP when it's stopped */
@@ -546,20 +546,20 @@ static int mchp_i2s_mcc_hw_params(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
 
-       switch (dev->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (dev->fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC:
                /* cpu is BCLK and LRC master */
                mra |= MCHP_I2SMCC_MRA_MODE_MASTER;
                if (dev->sysclk)
                        mra |= MCHP_I2SMCC_MRA_IMCKMODE_GEN;
                set_divs = 1;
                break;
-       case SND_SOC_DAIFMT_CBS_CFM:
+       case SND_SOC_DAIFMT_CBC_CFP:
                /* cpu is BCLK master */
                mrb |= MCHP_I2SMCC_MRB_CLKSEL_INT;
                set_divs = 1;
                fallthrough;
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_CBP_CFP:
                /* cpu is slave */
                mra |= MCHP_I2SMCC_MRA_MODE_SLAVE;
                if (dev->sysclk)

diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index 0be7b4221c1469cd6497952d60d8c71c35f2d5e4..f9331f7e80fe43939a8d6a394b32eb8b1c7965e7 100644 (file)
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -129,9 +129,9 @@ static int snd_proto_probe(struct platform_device *pdev)
        }
        if (bitclkmaster) {
                if (codec_np == bitclkmaster)
-                       dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
+                       dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;
                else
-                       dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
+                       dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;
        } else {
                dai_fmt |= snd_soc_daifmt_parse_clock_provider_as_flag(np, NULL);
        }

diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index ed1f69b570244f7078cc2c31a987a21c6153b901..915da92e1ec829b5e39ceeb05a709ca57d9f1b62 100644 (file)
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -126,7 +126,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = {
        .stream_name = "WM8731 PCM",
        .init = at91sam9g20ek_wm8731_init,
        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                  SND_SOC_DAIFMT_CBM_CFM,
+                  SND_SOC_DAIFMT_CBP_CFP,
        SND_SOC_DAILINK_REG(pcm),
 };
 

diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c
index 7745250fd743879ce2152d837dc6bfe1897c43db..7c45dc4f8c1bbd706333cb472524ac23c8fde9fd 100644 (file)
--- a/sound/soc/atmel/sam9x5_wm8731.c
+++ b/sound/soc/atmel/sam9x5_wm8731.c
@@ -115,7 +115,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
        dai->codecs->dai_name = "wm8731-hifi";
        dai->init = sam9x5_wm8731_init;
        dai->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF
-               | SND_SOC_DAIFMT_CBM_CFM;
+               | SND_SOC_DAIFMT_CBP_CFP;
 
        ret = snd_soc_of_parse_card_name(card, "atmel,model");
        if (ret) {

diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c
index 50c3dc6936f9072430c85d4b1cae804c610a74bc..1b3a31296c9b46341cc4127443988ec996442c77 100644 (file)
--- a/sound/soc/atmel/tse850-pcm5142.c
+++ b/sound/soc/atmel/tse850-pcm5142.c
@@ -304,7 +304,7 @@ static struct snd_soc_dai_link tse850_dailink = {
        .stream_name = "TSE-850-PCM",
        .dai_fmt = SND_SOC_DAIFMT_I2S
                 | SND_SOC_DAIFMT_NB_NF
-                | SND_SOC_DAIFMT_CBM_CFS,
+                | SND_SOC_DAIFMT_CBP_CFC,
        SND_SOC_DAILINK_REG(pcm),
 };