ASoC: intel: boards: remove dpcm_xxx flags

dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to
xxx_only if needed.

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

diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c
index 3c7cee03a02e6485c833fffa14c49d0fa3193967..d25a7188f603f18dbd5f84a7a41004d857760a06 100644 (file)
--- a/sound/soc/intel/boards/bdw-rt5650.c
+++ b/sound/soc/intel/boards/bdw-rt5650.c
@@ -239,8 +239,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                        SND_SOC_DPCM_TRIGGER_POST
                },
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(fe, dummy, platform),
        },
 
@@ -256,8 +254,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
                .ignore_pmdown_time = 1,
                .be_hw_params_fixup = broadwell_ssp0_fixup,
                .ops = &bdw_rt5650_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .init = bdw_rt5650_init,
                SND_SOC_DAILINK_REG(ssp0_port, be, platform),
        },

diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c
index 304af3d06d0170e7bf61d3382e83c8517ec7debd..9484f3410787698aae3b4f3d0e065948aaef3f58 100644 (file)
--- a/sound/soc/intel/boards/bdw-rt5677.c
+++ b/sound/soc/intel/boards/bdw-rt5677.c
@@ -329,8 +329,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                        SND_SOC_DPCM_TRIGGER_POST
                },
-               .dpcm_capture = 1,
-               .dpcm_playback = 1,
                .ops = &bdw_rt5677_fe_ops,
                SND_SOC_DAILINK_REG(fe, dummy, platform),
        },
@@ -356,8 +354,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
                .ignore_pmdown_time = 1,
                .be_hw_params_fixup = broadwell_ssp0_fixup,
                .ops = &bdw_rt5677_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .init = bdw_rt5677_init,
                .exit = bdw_rt5677_exit,
                SND_SOC_DAILINK_REG(ssp0_port, be, platform),

diff --git a/sound/soc/intel/boards/bdw_rt286.c b/sound/soc/intel/boards/bdw_rt286.c
index 58db09d9b6e16f4a4d564af77919c822792456d6..523ade9f31ab7f46fcd04d1a71a523a2ae4e3af4 100644 (file)
--- a/sound/soc/intel/boards/bdw_rt286.c
+++ b/sound/soc/intel/boards/bdw_rt286.c
@@ -133,8 +133,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(system, dummy, platform),
        },
        {
@@ -143,7 +141,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(offload0, dummy, platform),
        },
        {
@@ -152,7 +150,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(offload1, dummy, platform),
        },
        {
@@ -161,7 +159,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(loopback, dummy, platform),
        },
        /* Back End DAI links */
@@ -177,8 +175,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .ignore_pmdown_time = 1,
                .be_hw_params_fixup = codec_link_hw_params_fixup,
                .ops = &codec_link_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
        },
 };

diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c
index 8c2b4ab764bbafd0f8a8a8f9ca89f73613a7231f..68a3d345dc25df4e6e1349642fffefd59a77c23f 100644 (file)
--- a/sound/soc/intel/boards/bytcht_cx2072x.c
+++ b/sound/soc/intel/boards/bytcht_cx2072x.c
@@ -175,8 +175,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &byt_cht_cx2072x_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -185,7 +183,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &byt_cht_cx2072x_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -198,8 +196,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
                                              | SND_SOC_DAIFMT_CBC_CFC,
                .init = byt_cht_cx2072x_init,
                .be_hw_params_fixup = byt_cht_cx2072x_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(ssp2, cx2072x, platform),
        },
 };

diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c
index 9178bbe8d9950683c8bed0c2da7f559eea1c6ee2..31141d4b6b25692be9afb07cc6cae7911d588c95 100644 (file)
--- a/sound/soc/intel/boards/bytcht_da7213.c
+++ b/sound/soc/intel/boards/bytcht_da7213.c
@@ -174,8 +174,6 @@ static struct snd_soc_dai_link dailink[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -184,7 +182,7 @@ static struct snd_soc_dai_link dailink[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -197,8 +195,6 @@ static struct snd_soc_dai_link dailink[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                                | SND_SOC_DAIFMT_CBC_CFC,
                .be_hw_params_fixup = codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &ssp2_ops,
                SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
        },

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index d3327bc237b5f4709e003b22c8b115ea51819a30..62594e7966ab0fb234f5a39add6c351e914f9ac7 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -315,8 +315,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &byt_cht_es8316_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -326,7 +324,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &byt_cht_es8316_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -339,8 +337,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                                | SND_SOC_DAIFMT_CBC_CFC,
                .be_hw_params_fixup = byt_cht_es8316_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .init = byt_cht_es8316_init,
                SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
        },

diff --git a/sound/soc/intel/boards/bytcht_nocodec.c b/sound/soc/intel/boards/bytcht_nocodec.c
index 4a957d1cece356508a1c020bb7660323eebbbb03..fec23bda9e64312267a8e4729c7a95c414078625 100644 (file)
--- a/sound/soc/intel/boards/bytcht_nocodec.c
+++ b/sound/soc/intel/boards/bytcht_nocodec.c
@@ -119,8 +119,6 @@ static struct snd_soc_dai_link dais[] = {
                .ignore_suspend = 1,
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -130,7 +128,7 @@ static struct snd_soc_dai_link dais[] = {
                .ignore_suspend = 1,
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -144,8 +142,6 @@ static struct snd_soc_dai_link dais[] = {
                                                | SND_SOC_DAIFMT_CBC_CFC,
                .be_hw_params_fixup = codec_fixup,
                .ignore_suspend = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(ssp2_port, dummy, platform),
        },
 };

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 2ed49acb4e36e79467a082df6273839d6800f0b2..410eb36c37c930f95e884fde2c265e9647c4ffab 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1546,8 +1546,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
                .stream_name = "Baytrail Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &byt_rt5640_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -1556,7 +1554,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &byt_rt5640_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -1568,8 +1566,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                                | SND_SOC_DAIFMT_CBC_CFC,
                .be_hw_params_fixup = byt_rt5640_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .init = byt_rt5640_init,
                .exit = byt_rt5640_exit,
                .ops = &byt_rt5640_be_ssp2_ops,

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 8e4b821efe9277a31ad3d36a246f533bb33a1d7f..67c62844ca2a91500a87aaf74be39ef529be4246 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -770,8 +770,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &byt_rt5651_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -780,7 +778,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &byt_rt5651_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -793,8 +791,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                                | SND_SOC_DAIFMT_CBC_CFC,
                .be_hw_params_fixup = byt_rt5651_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .init = byt_rt5651_init,
                .ops = &byt_rt5651_be_ssp2_ops,
                SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),

diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c
index 0b10d89cb18920f176e5bdb48b647753a2c463d1..a6dfbcfdf74e3174c3dc65fc2a9a0b9cf4e8fc8a 100644 (file)
--- a/sound/soc/intel/boards/bytcr_wm5102.c
+++ b/sound/soc/intel/boards/bytcr_wm5102.c
@@ -462,8 +462,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
                .stream_name = "Baytrail Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &byt_wm5102_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
 
@@ -473,7 +471,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &byt_wm5102_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -490,8 +488,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                                | SND_SOC_DAIFMT_CBC_CFC,
                .be_hw_params_fixup = byt_wm5102_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .init = byt_wm5102_init,
                SND_SOC_DAILINK_REG(ssp0_port, ssp0_codec, platform),
        },

diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
index d7c1148588331471f09765e9a2c4cbbebc3a4618..36984de8a0679e06e01b8c5e2edaa29b753ae739 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
@@ -351,8 +351,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -361,7 +359,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -374,8 +372,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                                        | SND_SOC_DAIFMT_CBC_CFC,
                .init = cht_codec_init,
                .be_hw_params_fixup = cht_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_be_ssp2_ops,
                SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
        },

diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c
index 7651b83632fa4b020afa2fef29650df8b3b77e63..4afb292d4f13a7754315bd6fac41ad2c514f4702 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_nau8824.c
+++ b/sound/soc/intel/boards/cht_bsw_nau8824.c
@@ -193,8 +193,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -203,7 +201,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -217,8 +215,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                        | SND_SOC_DAIFMT_CBC_CFC,
                .init = cht_codec_init,
                .be_hw_params_fixup = cht_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_be_ssp2_ops,
                SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
        },

diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index ac23a8b7cafca2c4074d159b8f829c17c5401b75..b977a2db73a3a7d81bb90b89ddfccc207722a6a6 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -448,8 +448,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -458,7 +456,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -470,8 +468,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .no_pcm = 1,
                .init = cht_codec_init,
                .be_hw_params_fixup = cht_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_be_ssp2_ops,
                SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
        },

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index c6c469d51243ef189d99dc1d44a637f20aa93cca..aaef212cf44ec7b73c4ec5b845a41287628ee104 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -358,8 +358,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(media, dummy, platform),
        },
@@ -368,7 +366,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .stream_name = "Deep-Buffer Audio",
                .nonatomic = true,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &cht_aif1_ops,
                SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
@@ -381,8 +379,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
                .no_pcm = 1,
                .init = cht_codec_init,
                .be_hw_params_fixup = cht_codec_fixup,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &cht_be_ssp2_ops,
                SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
        },

diff --git a/sound/soc/intel/boards/ehl_rt5660.c b/sound/soc/intel/boards/ehl_rt5660.c
index 90d93e667bd9e1745ccaac096405b73402f5d9bb..ebc417c04a500c6219917a47d7a83b44a3c5ba7c 100644 (file)
--- a/sound/soc/intel/boards/ehl_rt5660.c
+++ b/sound/soc/intel/boards/ehl_rt5660.c
@@ -178,8 +178,6 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
                .name = "SSP0-Codec",
                .id = 0,
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &rt5660_ops,
                SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform),
        },
@@ -187,7 +185,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
                .name = "dmic48k",
                .id = 1,
                .ignore_suspend = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .no_pcm = 1,
                SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
        },
@@ -195,7 +193,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
                .name = "dmic16k",
                .id = 2,
                .ignore_suspend = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .no_pcm = 1,
                SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
        },
@@ -203,7 +201,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
                .name = "iDisp1",
                .id = 5,
                .init = hdmi_init,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .no_pcm = 1,
                SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
        },
@@ -211,7 +209,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
                .name = "iDisp2",
                .id = 6,
                .init = hdmi_init,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .no_pcm = 1,
                SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
        },
@@ -219,7 +217,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
                .name = "iDisp3",
                .id = 7,
                .init = hdmi_init,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .no_pcm = 1,
                SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
        },
@@ -227,7 +225,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
                .name = "iDisp4",
                .id = 8,
                .init = hdmi_init,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .no_pcm = 1,
                SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform),
        },

diff --git a/sound/soc/intel/boards/hsw_rt5640.c b/sound/soc/intel/boards/hsw_rt5640.c
index 1826a4dfd0f3515702db6b4c61ddb795825afeff..9bb2822ba63e3402b3065872fdc7eb016c95bca4 100644 (file)
--- a/sound/soc/intel/boards/hsw_rt5640.c
+++ b/sound/soc/intel/boards/hsw_rt5640.c
@@ -85,8 +85,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(system, dummy, platform),
        },
        {
@@ -95,7 +93,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(offload0, dummy, platform),
        },
        {
@@ -104,7 +102,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(offload1, dummy, platform),
        },
        {
@@ -113,7 +111,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .nonatomic = 1,
                .dynamic = 1,
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(loopback, dummy, platform),
        },
        /* Back End DAI links */
@@ -127,8 +125,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
                .ignore_pmdown_time = 1,
                .be_hw_params_fixup = codec_link_hw_params_fixup,
                .ops = &codec_link_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
        },
 };

diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c
index 24f716e42d6a38c26be9d086877391a4e9dfeaab..50e846d67c194e3f5d0b65bad8e1032d4904049a 100644 (file)
--- a/sound/soc/intel/boards/sof_board_helpers.c
+++ b/sound/soc/intel/boards/sof_board_helpers.c
@@ -217,8 +217,6 @@ static int set_ssp_codec_link(struct device *dev, struct snd_soc_dai_link *link,
 
        link->id = be_id;
        link->no_pcm = 1;
-       link->dpcm_capture = 1;
-       link->dpcm_playback = 1;
 
        return 0;
 }
@@ -268,7 +266,7 @@ static int set_dmic_link(struct device *dev, struct snd_soc_dai_link *link,
                link->init = dmic_init;
        link->ignore_suspend = 1;
        link->no_pcm = 1;
-       link->dpcm_capture = 1;
+       link->capture_only = 1;
 
        return 0;
 }
@@ -326,7 +324,7 @@ static int set_idisp_hdmi_link(struct device *dev, struct snd_soc_dai_link *link
        link->id = be_id;
        link->init = (hdmi_id == 1) ? hdmi_init : NULL;
        link->no_pcm = 1;
-       link->dpcm_playback = 1;
+       link->playback_only = 1;
 
        return 0;
 }
@@ -361,13 +359,12 @@ static int set_ssp_amp_link(struct device *dev, struct snd_soc_dai_link *link,
        /* codecs - caller to handle */
 
        /* platforms */
+       /* feedback stream or firmware-generated echo reference */
        link->platforms = platform_component;
        link->num_platforms = ARRAY_SIZE(platform_component);
 
        link->id = be_id;
        link->no_pcm = 1;
-       link->dpcm_capture = 1; /* feedback stream or firmware-generated echo reference */
-       link->dpcm_playback = 1;
 
        return 0;
 }
@@ -407,8 +404,6 @@ static int set_bt_offload_link(struct device *dev, struct snd_soc_dai_link *link
 
        link->id = be_id;
        link->no_pcm = 1;
-       link->dpcm_capture = 1;
-       link->dpcm_playback = 1;
 
        return 0;
 }
@@ -448,7 +443,7 @@ static int set_hdmi_in_link(struct device *dev, struct snd_soc_dai_link *link,
 
        link->id = be_id;
        link->no_pcm = 1;
-       link->dpcm_capture = 1;
+       link->capture_only = 1;
 
        return 0;
 }
@@ -496,8 +491,6 @@ static int set_hda_codec_link(struct device *dev, struct snd_soc_dai_link *link,
        if (be_type == SOF_HDA_ANALOG)
                link->init = hda_init;
        link->no_pcm = 1;
-       link->dpcm_capture = 1;
-       link->dpcm_playback = 1;
 
        return 0;
 }

diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
index fc998fe4b1960535752f9eabfb92739e1bcc460a..a927078768519505d97c2ef7bc0ad193b36e9a22 100644 (file)
--- a/sound/soc/intel/boards/sof_es8336.c
+++ b/sound/soc/intel/boards/sof_es8336.c
@@ -455,8 +455,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
        links[id].exit = sof_es8316_exit;
        links[id].ops = &sof_es8336_ops;
        links[id].nonatomic = true;
-       links[id].dpcm_playback = 1;
-       links[id].dpcm_capture = 1;
        links[id].no_pcm = 1;
        links[id].cpus = &cpus[id];
        links[id].num_cpus = 1;
@@ -496,7 +494,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
                links[id].platforms = platform_component;
                links[id].num_platforms = ARRAY_SIZE(platform_component);
                links[id].ignore_suspend = 1;
-               links[id].dpcm_capture = 1;
+               links[id].capture_only = 1;
                links[id].no_pcm = 1;
 
                id++;
@@ -539,7 +537,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
                links[id].platforms = platform_component;
                links[id].num_platforms = ARRAY_SIZE(platform_component);
                links[id].init = sof_hdmi_init;
-               links[id].dpcm_playback = 1;
+               links[id].playback_only = 1;
                links[id].no_pcm = 1;
 
                id++;
@@ -569,7 +567,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
                        links[id].num_codecs = 1;
                        links[id].platforms = platform_component;
                        links[id].num_platforms = ARRAY_SIZE(platform_component);
-                       links[id].dpcm_capture = 1;
+                       links[id].capture_only = 1;
                        links[id].no_pcm = 1;
                        links[id].num_cpus = 1;
                        id++;

diff --git a/sound/soc/intel/boards/sof_pcm512x.c b/sound/soc/intel/boards/sof_pcm512x.c
index 8d237f67bd0678df0b03fe3c30034c33b4f6b77e..68380b738d8832da673ed99911236ca3bb2cb9b0 100644 (file)
--- a/sound/soc/intel/boards/sof_pcm512x.c
+++ b/sound/soc/intel/boards/sof_pcm512x.c
@@ -246,12 +246,11 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
        links[id].num_platforms = ARRAY_SIZE(platform_component);
        links[id].init = sof_pcm512x_codec_init;
        links[id].ops = &sof_pcm512x_ops;
-       links[id].dpcm_playback = 1;
        /*
         * capture only supported with specific versions of the Hifiberry DAC+
         */
-       if (sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE)
-               links[id].dpcm_capture = 1;
+       if (!(sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE))
+               links[id].playback_only = 1;
        links[id].no_pcm = 1;
        links[id].cpus = &cpus[id];
        links[id].num_cpus = 1;
@@ -294,7 +293,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
                links[id].platforms = platform_component;
                links[id].num_platforms = ARRAY_SIZE(platform_component);
                links[id].ignore_suspend = 1;
-               links[id].dpcm_capture = 1;
+               links[id].capture_only = 1;
                links[id].no_pcm = 1;
                id++;
        }
@@ -341,7 +340,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
                links[id].platforms = platform_component;
                links[id].num_platforms = ARRAY_SIZE(platform_component);
                links[id].init = sof_hdmi_init;
-               links[id].dpcm_playback = 1;
+               links[id].playback_only = 1;
                links[id].no_pcm = 1;
                id++;
        }

diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c
index facc6c32cbfed8f1de1ffc6bf0dc36fc5902b885..51922347409f0dbd438ba74f1d6562827f29fd8a 100644 (file)
--- a/sound/soc/intel/boards/sof_wm8804.c
+++ b/sound/soc/intel/boards/sof_wm8804.c
@@ -167,8 +167,6 @@ static struct snd_soc_dai_link dailink[] = {
                .name = "SSP5-Codec",
                .id = 0,
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &sof_wm8804_ops,
                SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
        },