ASoC: mediatek: 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/87cyju9vhu.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c
index 4974b0536b7bb6f9ee88d111d0bbcb834496899b..00a79867235d24fc7a20d7f17712e9b3811c05a6 100644 (file)
--- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c
+++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c
@@ -221,7 +221,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                            SND_SOC_DPCM_TRIGGER_POST},
                .ops = &mt2701_cs42448_48k_fe_ops,
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(fe_multi_ch_out),
        },
        [DAI_LINK_FE_PCM0_IN] = {
@@ -231,7 +231,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                            SND_SOC_DPCM_TRIGGER_POST},
                .ops = &mt2701_cs42448_48k_fe_ops,
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(fe_pcm0_in),
        },
        [DAI_LINK_FE_PCM1_IN] = {
@@ -241,7 +241,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                            SND_SOC_DPCM_TRIGGER_POST},
                .ops = &mt2701_cs42448_48k_fe_ops,
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(fe_pcm1_in),
        },
        [DAI_LINK_FE_BT_OUT] = {
@@ -250,7 +250,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_POST,
                            SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(fe_bt_out),
        },
        [DAI_LINK_FE_BT_IN] = {
@@ -259,7 +259,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_POST,
                            SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(fe_bt_in),
        },
        /* BE */
@@ -269,8 +269,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
                         | SND_SOC_DAIFMT_GATED,
                .ops = &mt2701_cs42448_be_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(be_i2s0),
        },
        [DAI_LINK_BE_I2S1] = {
@@ -279,8 +277,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
                         | SND_SOC_DAIFMT_GATED,
                .ops = &mt2701_cs42448_be_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(be_i2s1),
        },
        [DAI_LINK_BE_I2S2] = {
@@ -289,8 +285,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
                         | SND_SOC_DAIFMT_GATED,
                .ops = &mt2701_cs42448_be_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(be_i2s2),
        },
        [DAI_LINK_BE_I2S3] = {
@@ -299,15 +293,11 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
                         | SND_SOC_DAIFMT_GATED,
                .ops = &mt2701_cs42448_be_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(be_i2s3),
        },
        [DAI_LINK_BE_MRG_BT] = {
                .name = "mt2701-cs42448-MRG-BT",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(be_mrg_bt),
        },
 };

diff --git a/sound/soc/mediatek/mt2701/mt2701-wm8960.c b/sound/soc/mediatek/mt2701/mt2701-wm8960.c
index 8a6643bfe830e36c3c86dd4cb38b9472b4ceee13..2814f0570928f24b47557e8d9078c488b9bf081a 100644 (file)
--- a/sound/soc/mediatek/mt2701/mt2701-wm8960.c
+++ b/sound/soc/mediatek/mt2701/mt2701-wm8960.c
@@ -67,7 +67,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_POST,
                            SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback),
        },
        {
@@ -76,7 +76,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_POST,
                            SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture),
        },
        /* BE */
@@ -86,8 +86,6 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
                        | SND_SOC_DAIFMT_GATED,
                .ops = &mt2701_wm8960_be_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(codec),
        },
 };

diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
index 784c201b8fd4b88d51e1f8fa70fde815d6ebc43d..daad9544a8d413d7a9f9a038024bf91872a63435 100644 (file)
--- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c
+++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
@@ -78,7 +78,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback_1),
        },
        {
@@ -87,7 +87,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback_2),
        },
        {
@@ -96,7 +96,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback_3),
        },
        {
@@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_1),
        },
        {
@@ -114,7 +114,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_2),
        },
        {
@@ -123,7 +123,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_3),
        },
        {
@@ -132,7 +132,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_mono_1),
        },
        {
@@ -141,8 +141,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_lpbk),
        },
@@ -152,8 +150,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_speech),
        },
@@ -161,24 +157,18 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
        {
                .name = "Primary Codec",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(primary_codec),
        },
        {
                .name = "PCM 1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm1),
        },
        {
                .name = "PCM 2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm2),
        },

diff --git a/sound/soc/mediatek/mt7986/mt7986-wm8960.c b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
index 6982e833421d6312064fe74fd491c27216f14458..c3d1e2eeb0e571347438b67b784a72ab3d26f6eb 100644 (file)
--- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c
+++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
@@ -45,7 +45,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_POST,
                            SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback),
        },
        {
@@ -54,7 +54,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_POST,
                            SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture),
        },
        /* BE */
@@ -65,8 +65,6 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = {
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS |
                        SND_SOC_DAIFMT_GATED,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(codec),
        },
 };

diff --git a/sound/soc/mediatek/mt8173/mt8173-max98090.c b/sound/soc/mediatek/mt8173/mt8173-max98090.c
index 0557a287c641a3ce863a2bd746074d9221688faa..0724564cee6a6ab8c0bf06b1237b24cd7447c53e 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-max98090.c
+++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c
@@ -104,7 +104,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = {
                .stream_name = "MAX98090 Playback",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback),
        },
        {
@@ -112,7 +112,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = {
                .stream_name = "MAX98090 Capture",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture),
        },
        /* Back End DAI links */
@@ -123,8 +123,6 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = {
                .ops = &mt8173_max98090_ops,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(hifi),
        },
 };

diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
index 4ed06c269065249798a17859f9c7618f17e32723..d8e4e70d834cec6131b2547de3509a185ed90d73 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
@@ -139,7 +139,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = {
                .stream_name = "rt5650_rt5514 Playback",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback),
        },
        [DAI_LINK_CAPTURE] = {
@@ -147,7 +147,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = {
                .stream_name = "rt5650_rt5514 Capture",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture),
        },
        /* Back End DAI links */
@@ -159,8 +159,6 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = {
                           SND_SOC_DAIFMT_CBS_CFS,
                .ops = &mt8173_rt5650_rt5514_ops,
                .ignore_pmdown_time = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(codec),
        },
 };

diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
index 763067c211539c0ef6e414e3b1cbe3a42b80f607..488f2314dbf78e1940983deca133e623595765c6 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
@@ -171,7 +171,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
                .stream_name = "rt5650_rt5676 Playback",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback),
        },
        [DAI_LINK_CAPTURE] = {
@@ -179,7 +179,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
                .stream_name = "rt5650_rt5676 Capture",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture),
        },
        [DAI_LINK_HDMI] = {
@@ -187,7 +187,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
                .stream_name = "HDMI PCM",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(hdmi_pcm),
        },
 
@@ -200,14 +200,12 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
                           SND_SOC_DAIFMT_CBS_CFS,
                .ops = &mt8173_rt5650_rt5676_ops,
                .ignore_pmdown_time = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(codec),
        },
        [DAI_LINK_HDMI_I2S] = {
                .name = "HDMI BE",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(hdmi_be),
        },
        /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */

diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
index 466f176f8e94804e85c0250c966eac4e243d8cd6..59c19fdd867581b7306c4378cf11b889733adcf5 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
@@ -210,7 +210,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
                .stream_name = "rt5650 Playback",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback),
        },
        [DAI_LINK_CAPTURE] = {
@@ -218,7 +218,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
                .stream_name = "rt5650 Capture",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture),
        },
        [DAI_LINK_HDMI] = {
@@ -226,7 +226,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
                .stream_name = "HDMI PCM",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(hdmi_pcm),
        },
        /* Back End DAI links */
@@ -238,14 +238,12 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
                           SND_SOC_DAIFMT_CBS_CFS,
                .ops = &mt8173_rt5650_ops,
                .ignore_pmdown_time = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(codec),
        },
        [DAI_LINK_HDMI_I2S] = {
                .name = "HDMI BE",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .init = mt8173_rt5650_hdmi_init,
                SND_SOC_DAILINK_REG(hdmi_be),
        },

diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index f848e14b091a157417c943616376321beb736f84..1d8881e0a361ac7c53a3712fd998b64fb2db0a15 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -425,7 +425,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8183_da7219_max98357_ops,
                SND_SOC_DAILINK_REG(playback1),
        },
@@ -435,7 +435,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8183_da7219_max98357_bt_sco_ops,
                SND_SOC_DAILINK_REG(playback2),
        },
@@ -445,7 +445,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback3),
        },
        {
@@ -454,7 +454,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8183_da7219_max98357_bt_sco_ops,
                SND_SOC_DAILINK_REG(capture1),
        },
@@ -464,7 +464,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture2),
        },
        {
@@ -473,7 +473,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8183_da7219_max98357_ops,
                SND_SOC_DAILINK_REG(capture3),
        },
@@ -483,7 +483,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_mono),
        },
        {
@@ -492,38 +492,32 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback_hdmi),
        },
        /* BE */
        {
                .name = "Primary Codec",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(primary_codec),
        },
        {
                .name = "PCM 1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm1),
        },
        {
                .name = "PCM 2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm2),
        },
        {
                .name = "I2S0",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ops = &mt8183_mt6358_i2s_ops,
@@ -532,7 +526,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
        {
                .name = "I2S1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ops = &mt8183_mt6358_i2s_ops,
@@ -541,7 +535,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
        {
                .name = "I2S2",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ops = &mt8183_da7219_i2s_ops,
@@ -551,13 +545,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
        {
                .name = "I2S3",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
        },
        {
                .name = "I2S5",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ops = &mt8183_mt6358_i2s_ops,
@@ -570,7 +564,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_IB_IF |
                           SND_SOC_DAIFMT_CBM_CFM,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ignore = 1,

diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
index bb6df056a8789bc72aa8b2361bd3036821a372c4..6267c8554c1522dd64a3aaa60a9133e8526b25fe 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
@@ -430,7 +430,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8183_mt6358_ops,
                SND_SOC_DAILINK_REG(playback1),
        },
@@ -440,7 +440,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops,
                SND_SOC_DAILINK_REG(playback2),
        },
@@ -450,7 +450,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback3),
        },
        {
@@ -459,7 +459,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops,
                SND_SOC_DAILINK_REG(capture1),
        },
@@ -469,7 +469,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture2),
        },
        {
@@ -478,7 +478,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8183_mt6358_ops,
                SND_SOC_DAILINK_REG(capture3),
        },
@@ -488,7 +488,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_mono),
        },
        {
@@ -497,7 +497,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback_hdmi),
        },
        {
@@ -513,31 +513,25 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
        {
                .name = "Primary Codec",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(primary_codec),
        },
        {
                .name = "PCM 1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm1),
        },
        {
                .name = "PCM 2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm2),
        },
        {
                .name = "I2S0",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .ops = &mt8183_mt6358_i2s_ops,
                SND_SOC_DAILINK_REG(i2s0),
@@ -545,7 +539,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
        {
                .name = "I2S1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ops = &mt8183_mt6358_i2s_ops,
@@ -554,7 +548,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
        {
                .name = "I2S2",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ops = &mt8183_mt6358_i2s_ops,
@@ -564,13 +558,13 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
        {
                .name = "I2S3",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
        },
        {
                .name = "I2S5",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .ops = &mt8183_mt6358_i2s_ops,
                .init = &mt8183_bt_init,
@@ -582,7 +576,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_IB_IF |
                           SND_SOC_DAIFMT_CBM_CFM,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
                .ops = &mt8183_mt6358_tdm_ops,

diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366.c b/sound/soc/mediatek/mt8186/mt8186-mt6366.c
index 771d53611c2a41d04cd53dd6bc83b5eb6c0c6904..a5ef913743d4e699b41a74c2951f9b1f5c4c1ac7 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-mt6366.c
+++ b/sound/soc/mediatek/mt8186/mt8186-mt6366.c
@@ -647,7 +647,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
@@ -660,7 +660,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback12),
        },
        {
@@ -669,7 +669,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
@@ -681,7 +681,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
@@ -694,7 +694,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback4),
        },
        {
@@ -703,7 +703,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback5),
        },
        {
@@ -712,7 +712,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback6),
        },
        {
@@ -721,7 +721,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback7),
        },
        {
@@ -730,7 +730,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback8),
        },
        {
@@ -739,7 +739,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture1),
        },
        {
@@ -748,7 +748,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
@@ -761,7 +761,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture3),
        },
        {
@@ -770,7 +770,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
@@ -783,7 +783,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture5),
        },
        {
@@ -792,7 +792,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
@@ -804,7 +804,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture7),
        },
        {
@@ -813,8 +813,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_lpbk),
        },
@@ -824,8 +822,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_fm),
        },
@@ -835,8 +831,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_src1),
        },
@@ -846,8 +840,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_src_bargein),
        },
@@ -857,7 +849,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_hw_gain_aaudio),
        },
@@ -867,8 +859,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_src_aaudio),
        },
@@ -876,8 +866,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
        {
                .name = "Primary Codec",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                .init = primary_codec_init,
                SND_SOC_DAILINK_REG(adda),
@@ -888,7 +876,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_IB_IF |
                           SND_SOC_DAIFMT_CBM_CFM,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .init = mt8186_mt6366_rt1019_rt5682s_hdmi_init,
                SND_SOC_DAILINK_REG(i2s3),
@@ -896,7 +884,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
        {
                .name = "I2S0",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .ops = &mt8186_rt5682s_i2s_ops,
                SND_SOC_DAILINK_REG(i2s0),
@@ -904,7 +892,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
        {
                .name = "I2S1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .init = mt8186_headset_codec_init,
                SND_SOC_DAILINK_REG(i2s1),
@@ -912,46 +900,38 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
        {
                .name = "I2S2",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(i2s2),
        },
        {
                .name = "HW Gain 1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hw_gain1),
        },
        {
                .name = "HW Gain 2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hw_gain2),
        },
        {
                .name = "HW_SRC_1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hw_src1),
        },
        {
                .name = "HW_SRC_2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hw_src2),
        },
        {
                .name = "CONNSYS_I2S",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(connsys_i2s),
        },
@@ -960,15 +940,13 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_NB_IF,
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm1),
        },
        {
                .name = "TDM IN",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(tdm_in),
        },
@@ -976,35 +954,35 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
        {
                .name = "Hostless_UL1",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_ul1),
        },
        {
                .name = "Hostless_UL2",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_ul2),
        },
        {
                .name = "Hostless_UL3",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_ul3),
        },
        {
                .name = "Hostless_UL5",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_ul5),
        },
        {
                .name = "Hostless_UL6",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(hostless_ul6),
        },
@@ -1012,25 +990,25 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
        {
                .name = "AFE_SOF_DL1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(AFE_SOF_DL1),
        },
        {
                .name = "AFE_SOF_DL2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(AFE_SOF_DL2),
        },
        {
                .name = "AFE_SOF_UL1",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(AFE_SOF_UL1),
        },
        {
                .name = "AFE_SOF_UL2",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(AFE_SOF_UL2),
        },
 };

diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
index 08ae962afeb92965109b303439419bc6e7c2a896..84abdba9ddb6d67127d10a8784d0e1d5c0de5639 100644 (file)
--- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
+++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
@@ -932,7 +932,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
                .dpcm_merged_format = 1,
@@ -946,7 +946,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
                .dpcm_merged_format = 1,
@@ -960,7 +960,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
                .dpcm_merged_format = 1,
@@ -974,7 +974,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_PRE,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback7),
        },
        [DAI_LINK_DL8_FE] = {
@@ -985,7 +985,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback8),
        },
        [DAI_LINK_DL10_FE] = {
@@ -996,7 +996,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback10),
        },
        [DAI_LINK_DL11_FE] = {
@@ -1007,7 +1007,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback11),
        },
        [DAI_LINK_UL1_FE] = {
@@ -1018,7 +1018,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_PRE,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture1),
        },
        [DAI_LINK_UL2_FE] = {
@@ -1029,7 +1029,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture2),
        },
        [DAI_LINK_UL3_FE] = {
@@ -1040,7 +1040,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture3),
        },
        [DAI_LINK_UL4_FE] = {
@@ -1051,7 +1051,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
                .dpcm_merged_format = 1,
@@ -1065,7 +1065,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
                .dpcm_merged_format = 1,
@@ -1079,7 +1079,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_PRE,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture6),
        },
        [DAI_LINK_UL8_FE] = {
@@ -1090,7 +1090,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture8),
        },
        [DAI_LINK_UL9_FE] = {
@@ -1101,7 +1101,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture9),
        },
        [DAI_LINK_UL10_FE] = {
@@ -1112,14 +1112,14 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture10),
        },
        /* BE */
        [DAI_LINK_DL_SRC_BE] = {
                .name = "DL_SRC_BE",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(dl_src),
        },
        [DAI_LINK_DPTX_BE] = {
@@ -1127,7 +1127,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                .ops = &mt8188_dptx_ops,
                .be_hw_params_fixup = mt8188_dptx_hw_params_fixup,
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(dptx),
        },
        [DAI_LINK_ETDM1_IN_BE] = {
@@ -1136,7 +1136,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(etdm1_in),
        },
@@ -1146,7 +1146,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(etdm2_in),
        },
        [DAI_LINK_ETDM1_OUT_BE] = {
@@ -1155,7 +1155,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(etdm1_out),
        },
        [DAI_LINK_ETDM2_OUT_BE] = {
@@ -1164,7 +1164,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(etdm2_out),
        },
        [DAI_LINK_ETDM3_OUT_BE] = {
@@ -1173,7 +1173,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(etdm3_out),
        },
        [DAI_LINK_PCM1_BE] = {
@@ -1182,14 +1182,12 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(pcm1),
        },
        [DAI_LINK_UL_SRC_BE] = {
                .name = "UL_SRC_BE",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(ul_src),
        },
 
@@ -1197,28 +1195,28 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
        [DAI_LINK_SOF_DL2_BE] = {
                .name = "AFE_SOF_DL2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8188_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_DL2),
        },
        [DAI_LINK_SOF_DL3_BE] = {
                .name = "AFE_SOF_DL3",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8188_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_DL3),
        },
        [DAI_LINK_SOF_UL4_BE] = {
                .name = "AFE_SOF_UL4",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8188_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_UL4),
        },
        [DAI_LINK_SOF_UL5_BE] = {
                .name = "AFE_SOF_UL5",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8188_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_UL5),
        },

diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index db00704e206d6d3f500a5c8533e0159f16cf77b4..1aba9c75594eb663914e6d7a8e8409c316c21f46 100644 (file)
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -598,7 +598,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback1),
        },
        {
@@ -607,7 +607,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback12),
        },
        {
@@ -616,7 +616,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback2),
        },
        {
@@ -625,7 +625,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(playback3),
        },
@@ -635,7 +635,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback4),
        },
        {
@@ -644,7 +644,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback5),
        },
        {
@@ -653,7 +653,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback6),
        },
        {
@@ -662,7 +662,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback7),
        },
        {
@@ -671,7 +671,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback8),
        },
        {
@@ -680,7 +680,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback9),
        },
        {
@@ -689,7 +689,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(capture1),
        },
@@ -699,7 +699,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(capture2),
        },
@@ -709,7 +709,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture3),
        },
        {
@@ -718,7 +718,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture4),
        },
        {
@@ -727,7 +727,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture5),
        },
        {
@@ -736,7 +736,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture6),
        },
        {
@@ -745,7 +745,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture7),
        },
        {
@@ -754,7 +754,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture8),
        },
        {
@@ -763,7 +763,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_mono1),
        },
        {
@@ -772,7 +772,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_mono2),
        },
        {
@@ -781,7 +781,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(capture_mono3),
        },
        {
@@ -790,15 +790,13 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .trigger = {SND_SOC_DPCM_TRIGGER_PRE,
                            SND_SOC_DPCM_TRIGGER_PRE},
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(playback_hdmi),
        },
        /* Back End DAI links */
        {
                .name = "Primary Codec",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                .init = mt8192_mt6359_init,
                SND_SOC_DAILINK_REG(primary_codec),
@@ -806,29 +804,27 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "Primary Codec CH34",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(primary_codec_ch34),
        },
        {
                .name = "AP_DMIC",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(ap_dmic),
        },
        {
                .name = "AP_DMIC_CH34",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(ap_dmic_ch34),
        },
        {
                .name = "I2S0",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s0),
@@ -836,7 +832,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s1),
@@ -844,7 +840,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S2",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s2),
@@ -852,7 +848,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S3",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s3),
@@ -860,7 +856,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S5",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s5),
@@ -868,7 +864,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S6",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s6),
@@ -876,7 +872,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S7",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s7),
@@ -884,7 +880,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S8",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                .init = mt8192_rt5682_init,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
@@ -894,7 +890,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "I2S9",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                SND_SOC_DAILINK_REG(i2s9),
@@ -903,23 +899,19 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
        {
                .name = "CONNSYS_I2S",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(connsys_i2s),
        },
        {
                .name = "PCM 1",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm1),
        },
        {
                .name = "PCM 2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ignore_suspend = 1,
                SND_SOC_DAILINK_REG(pcm2),
        },
@@ -929,7 +921,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_DSP_A |
                           SND_SOC_DAIFMT_IB_NF |
                           SND_SOC_DAIFMT_CBM_CFM,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
                .ignore = 1,

diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
index 2832ef78eaed7283eaad822931ce0b515fa44d0a..56b9d2433a1eb1f3f60e657c7308027956177bbc 100644 (file)
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
@@ -913,7 +913,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(DL2_FE),
        },
@@ -925,7 +925,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(DL3_FE),
        },
@@ -937,7 +937,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(DL6_FE),
        },
@@ -949,7 +949,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_PRE,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(DL7_FE),
        },
        [DAI_LINK_DL8_FE] = {
@@ -960,7 +960,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(DL8_FE),
        },
@@ -972,7 +972,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8195_hdmitx_dptx_playback_ops,
                SND_SOC_DAILINK_REG(DL10_FE),
        },
@@ -984,7 +984,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(DL11_FE),
        },
@@ -996,7 +996,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_PRE,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(UL1_FE),
        },
        [DAI_LINK_UL2_FE] = {
@@ -1007,7 +1007,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(UL2_FE),
        },
@@ -1019,7 +1019,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(UL3_FE),
        },
@@ -1031,7 +1031,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(UL4_FE),
        },
@@ -1043,7 +1043,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(UL5_FE),
        },
@@ -1055,7 +1055,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_PRE,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(UL6_FE),
        },
        [DAI_LINK_UL8_FE] = {
@@ -1066,7 +1066,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(UL8_FE),
        },
@@ -1078,7 +1078,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(UL9_FE),
        },
@@ -1090,7 +1090,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                        SND_SOC_DPCM_TRIGGER_POST,
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(UL10_FE),
        },
@@ -1098,13 +1098,13 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
        [DAI_LINK_DL_SRC_BE] = {
                .name = "DL_SRC_BE",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(DL_SRC_BE),
        },
        [DAI_LINK_DPTX_BE] = {
                .name = "DPTX_BE",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8195_dptx_ops,
                .be_hw_params_fixup = mt8195_dptx_hw_params_fixup,
                SND_SOC_DAILINK_REG(DPTX_BE),
@@ -1115,7 +1115,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(ETDM1_IN_BE),
        },
        [DAI_LINK_ETDM2_IN_BE] = {
@@ -1124,7 +1124,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .be_hw_params_fixup = mt8195_etdm_hw_params_fixup,
                SND_SOC_DAILINK_REG(ETDM2_IN_BE),
        },
@@ -1134,7 +1134,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .be_hw_params_fixup = mt8195_etdm_hw_params_fixup,
                SND_SOC_DAILINK_REG(ETDM1_OUT_BE),
        },
@@ -1144,7 +1144,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(ETDM2_OUT_BE),
        },
        [DAI_LINK_ETDM3_OUT_BE] = {
@@ -1153,7 +1153,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                SND_SOC_DAILINK_REG(ETDM3_OUT_BE),
        },
        [DAI_LINK_PCM1_BE] = {
@@ -1162,48 +1162,46 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(PCM1_BE),
        },
        [DAI_LINK_UL_SRC1_BE] = {
                .name = "UL_SRC1_BE",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(UL_SRC1_BE),
        },
        [DAI_LINK_UL_SRC2_BE] = {
                .name = "UL_SRC2_BE",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(UL_SRC2_BE),
        },
        /* SOF BE */
        [DAI_LINK_SOF_DL2_BE] = {
                .name = "AFE_SOF_DL2",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8195_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_DL2),
        },
        [DAI_LINK_SOF_DL3_BE] = {
                .name = "AFE_SOF_DL3",
                .no_pcm = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &mt8195_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_DL3),
        },
        [DAI_LINK_SOF_UL4_BE] = {
                .name = "AFE_SOF_UL4",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8195_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_UL4),
        },
        [DAI_LINK_SOF_UL5_BE] = {
                .name = "AFE_SOF_UL5",
                .no_pcm = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &mt8195_sof_be_ops,
                SND_SOC_DAILINK_REG(AFE_SOF_UL5),
        },

diff --git a/sound/soc/mediatek/mt8365/mt8365-mt6357.c b/sound/soc/mediatek/mt8365/mt8365-mt6357.c
index 42cbdfdfadb558b44ece9b5b9e1178b694e8d791..d398e83ea05281719332aa0fc39f16bc2ae73955 100644 (file)
--- a/sound/soc/mediatek/mt8365/mt8365-mt6357.c
+++ b/sound/soc/mediatek/mt8365/mt8365-mt6357.c
@@ -168,7 +168,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = {
                        SND_SOC_DPCM_TRIGGER_POST
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_rate = 1,
                SND_SOC_DAILINK_REG(playback1),
        },
@@ -181,7 +181,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = {
                        SND_SOC_DPCM_TRIGGER_POST
                },
                .dynamic = 1,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .dpcm_merged_rate = 1,
                SND_SOC_DAILINK_REG(playback2),
        },
@@ -194,7 +194,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = {
                        SND_SOC_DPCM_TRIGGER_POST
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .dpcm_merged_rate = 1,
                SND_SOC_DAILINK_REG(awb_capture),
        },
@@ -207,7 +207,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = {
                        SND_SOC_DPCM_TRIGGER_POST
                },
                .dynamic = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .dpcm_merged_rate = 1,
                SND_SOC_DAILINK_REG(vul),
        },
@@ -219,23 +219,19 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                                SND_SOC_DAIFMT_NB_NF |
                                SND_SOC_DAIFMT_CBS_CFS,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(i2s3),
        },
        [DAI_LINK_DMIC] = {
                .name = "DMIC_BE",
                .no_pcm = 1,
                .id = DAI_LINK_DMIC,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                SND_SOC_DAILINK_REG(dmic),
        },
        [DAI_LINK_INT_ADDA] = {
                .name = "MTK_Codec",
                .no_pcm = 1,
                .id = DAI_LINK_INT_ADDA,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &mt8365_mt6357_int_adda_ops,
                SND_SOC_DAILINK_REG(primary_codec),
        },