ASoC: remove SND_SOC_POSSIBLE_xBx_xFx

Clock provider / consumer selection is based on board, we can't select
automatically from software. Let's remove SND_SOC_POSSIBLE_xBx_xFx.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87tsrc36li.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index df010a91b35059279f6729fdd13e7acc1e5ff575..c40823ba5456443dc9dc076b1892921e19fbb18c 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -140,14 +140,6 @@ struct clk;
 #define SND_SOC_DAIFMT_BP_FC           SND_SOC_DAIFMT_CBP_CFC
 #define SND_SOC_DAIFMT_BC_FC           SND_SOC_DAIFMT_CBC_CFC
 
-/* Describes the possible PCM format */
-#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT   48
-#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_MASK    (0xFFFFULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
-#define SND_SOC_POSSIBLE_DAIFMT_CBP_CFP                        (0x1ULL    << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
-#define SND_SOC_POSSIBLE_DAIFMT_CBC_CFP                        (0x2ULL    << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
-#define SND_SOC_POSSIBLE_DAIFMT_CBP_CFC                        (0x4ULL    << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
-#define SND_SOC_POSSIBLE_DAIFMT_CBC_CFC                        (0x8ULL    << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
-
 #define SND_SOC_DAIFMT_FORMAT_MASK             0x000f
 #define SND_SOC_DAIFMT_CLOCK_MASK              0x00f0
 #define SND_SOC_DAIFMT_INV_MASK                        0x0f00

diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c
index 3b198b9b460516574f85b5064b4334031603201c..3e0696b5abf527db6d6d433a4495f26a3d60be71 100644 (file)
--- a/sound/soc/codecs/ak4613.c
+++ b/sound/soc/codecs/ak4613.c
@@ -748,11 +748,6 @@ static int ak4613_dai_trigger(struct snd_pcm_substream *substream, int cmd,
        return 0;
 }
 
-/*
- * Select below from Sound Card, not Auto
- *     SND_SOC_DAIFMT_CBC_CFC
- *     SND_SOC_DAIFMT_CBP_CFP
- */
 static const u64 ak4613_dai_formats =
        SND_SOC_POSSIBLE_DAIFMT_I2S     |
        SND_SOC_POSSIBLE_DAIFMT_LEFT_J;

diff --git a/sound/soc/codecs/ak4619.c b/sound/soc/codecs/ak4619.c
index 755c002f0f1599f2188183d2a905c1a8e7f406e3..192b0c3413968fdd4ef9b2a05c78f60c9de95162 100644 (file)
--- a/sound/soc/codecs/ak4619.c
+++ b/sound/soc/codecs/ak4619.c
@@ -778,12 +778,6 @@ static int ak4619_dai_startup(struct snd_pcm_substream *substream,
 }
 
 static u64 ak4619_dai_formats[] = {
-       /*
-        * Select below from Sound Card, not here
-        *      SND_SOC_DAIFMT_CBC_CFC
-        *      SND_SOC_DAIFMT_CBP_CFP
-        */
-
        /* First Priority */
        SND_SOC_POSSIBLE_DAIFMT_I2S     |
        SND_SOC_POSSIBLE_DAIFMT_LEFT_J,

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 98b8858ded02536e495bf9bcbd64bdee5f13bc42..4bf91ab2553a20bb26f801831f07a4c8a9f5951a 100644 (file)
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1720,11 +1720,6 @@ static int da7213_set_component_pll(struct snd_soc_component *component,
        return _da7213_set_component_pll(component, pll_id, source, fref, fout);
 }
 
-/*
- * Select below from Sound Card, not Auto
- *     SND_SOC_DAIFMT_CBC_CFC
- *     SND_SOC_DAIFMT_CBP_CFP
- */
 static const u64 da7213_dai_formats =
        SND_SOC_POSSIBLE_DAIFMT_I2S     |
        SND_SOC_POSSIBLE_DAIFMT_LEFT_J  |

diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c
index 4503f2f0724e6dd6fddb43bbb8325d97d3b77ab4..55a7fd5f9251a5e19f1c28d362877c95d74324cc 100644 (file)
--- a/sound/soc/codecs/pcm3168a.c
+++ b/sound/soc/codecs/pcm3168a.c
@@ -563,12 +563,6 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
 }
 
 static const u64 pcm3168a_dai_formats[] = {
-       /*
-        * Select below from Sound Card, not here
-        *      SND_SOC_DAIFMT_CBC_CFC
-        *      SND_SOC_DAIFMT_CBP_CFP
-        */
-
        /*
         * First Priority
         */

diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c
index fc40d024152e6270024ee473350ce8dcec45b2e5..6f9f498c4c5c15fcf279d84adde1a6d0c28b7ec2 100644 (file)
--- a/sound/soc/generic/test-component.c
+++ b/sound/soc/generic/test-component.c
@@ -191,13 +191,6 @@ static int test_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct
 }
 
 static const u64 test_dai_formats =
-       /*
-        * Select below from Sound Card, not auto
-        *      SND_SOC_POSSIBLE_DAIFMT_BP_FP
-        *      SND_SOC_POSSIBLE_DAIFMT_BC_FP
-        *      SND_SOC_POSSIBLE_DAIFMT_BP_FC
-        *      SND_SOC_POSSIBLE_DAIFMT_BC_FC
-        */
        SND_SOC_POSSIBLE_DAIFMT_I2S     |
        SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |
        SND_SOC_POSSIBLE_DAIFMT_LEFT_J  |

diff --git a/sound/soc/renesas/fsi.c b/sound/soc/renesas/fsi.c
index fb376569b470fd0fb80abe0a0f36fadfdb4bffb8..ae86014c38197f6e551aa5803829df5767834d03 100644 (file)
--- a/sound/soc/renesas/fsi.c
+++ b/sound/soc/renesas/fsi.c
@@ -1773,11 +1773,6 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
        return 0;
 }
 
-/*
- * Select below from Sound Card, not auto
- *     SND_SOC_DAIFMT_CBC_CFC
- *     SND_SOC_DAIFMT_CBP_CFP
- */
 static const u64 fsi_dai_formats =
        SND_SOC_POSSIBLE_DAIFMT_I2S     |
        SND_SOC_POSSIBLE_DAIFMT_LEFT_J  |

diff --git a/sound/soc/renesas/rcar/core.c b/sound/soc/renesas/rcar/core.c
index 9ce56cd84f46d649729b5bc4fcd982e239d319c2..82fbdd550714cd185cc4217df92b3b4ddfcd7d8e 100644 (file)
--- a/sound/soc/renesas/rcar/core.c
+++ b/sound/soc/renesas/rcar/core.c
@@ -1058,9 +1058,6 @@ static const u64 rsnd_soc_dai_formats[] = {
         * 1st Priority
         *
         * Well tested formats.
-        * Select below from Sound Card, not auto
-        *      SND_SOC_DAIFMT_CBC_CFC
-        *      SND_SOC_DAIFMT_CBP_CFP
         */
        SND_SOC_POSSIBLE_DAIFMT_I2S     |
        SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |

diff --git a/sound/soc/renesas/rcar/msiof.c b/sound/soc/renesas/rcar/msiof.c
index 2671abc028ccee426ae1ab22346e458f33fee835..128543fc4fc97162cff601dd757cac5ac0aefac3 100644 (file)
--- a/sound/soc/renesas/rcar/msiof.c
+++ b/sound/soc/renesas/rcar/msiof.c
@@ -363,11 +363,6 @@ static int msiof_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        return 0;
 }
 
-/*
- * Select below from Sound Card, not auto
- *     SND_SOC_DAIFMT_CBC_CFC
- *     SND_SOC_DAIFMT_CBP_CFP
- */
 static const u64 msiof_dai_formats = SND_SOC_POSSIBLE_DAIFMT_I2S       |
                                     SND_SOC_POSSIBLE_DAIFMT_LEFT_J     |
                                     SND_SOC_POSSIBLE_DAIFMT_NB_NF;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ac9b2269c26ecb6ef35bab9b93852dd45b2b64d9..b87219be5860e5e6dfc13c197c4af652cd984ec2 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1401,21 +1401,6 @@ found:
                case SND_SOC_POSSIBLE_DAIFMT_IB_IF:
                        dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_INV_MASK) | SND_SOC_DAIFMT_IB_IF;
                        break;
-               /*
-                * for clock provider / consumer
-                */
-               case SND_SOC_POSSIBLE_DAIFMT_CBP_CFP:
-                       dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBP_CFP;
-                       break;
-               case SND_SOC_POSSIBLE_DAIFMT_CBC_CFP:
-                       dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBC_CFP;
-                       break;
-               case SND_SOC_POSSIBLE_DAIFMT_CBP_CFC:
-                       dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBP_CFC;
-                       break;
-               case SND_SOC_POSSIBLE_DAIFMT_CBC_CFC:
-                       dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBC_CFC;
-                       break;
                }
        }
 

diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 9cb7567e263eb20cca79cc07bfd862398f7c2027..87e9c86ca4f885c6acd9b34395bc0c3eab85d764 100644 (file)
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -183,13 +183,6 @@ static const struct snd_soc_component_driver dummy_codec = {
                        SNDRV_PCM_FMTBIT_U32_LE | \
                        SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
 
-/*
- * Select these from Sound Card Manually
- *     SND_SOC_POSSIBLE_DAIFMT_CBP_CFP
- *     SND_SOC_POSSIBLE_DAIFMT_CBP_CFC
- *     SND_SOC_POSSIBLE_DAIFMT_CBC_CFP
- *     SND_SOC_POSSIBLE_DAIFMT_CBC_CFC
- */
 static const u64 dummy_dai_formats =
        SND_SOC_POSSIBLE_DAIFMT_I2S     |
        SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |