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

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index 77cf72082e73d755a8187e874b305e848a4a5e6b..02b04f355ca66315f4a7287faf5cb545bd7e68aa 100644 (file)
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -542,7 +542,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .init = cz_da7219_init,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_da7219_play_ops,
                SND_SOC_DAILINK_REG(designware1, dlgs, platform),
@@ -552,7 +552,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .stream_name = "Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_da7219_cap_ops,
                SND_SOC_DAILINK_REG(designware2, dlgs, platform),
@@ -562,7 +562,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .stream_name = "HiFi Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_max_play_ops,
                SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -573,7 +573,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .stream_name = "DMIC0 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_dmic0_cap_ops,
                SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -584,7 +584,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .stream_name = "DMIC1 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_dmic1_cap_ops,
                SND_SOC_DAILINK_REG(designware2, adau, platform),
@@ -598,7 +598,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .init = cz_rt5682_init,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_play_ops,
                SND_SOC_DAILINK_REG(designware1, rt5682, platform),
@@ -608,7 +608,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .stream_name = "Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_cap_ops,
                SND_SOC_DAILINK_REG(designware2, rt5682, platform),
@@ -618,7 +618,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .stream_name = "HiFi Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_max_play_ops,
                SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -629,7 +629,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .stream_name = "DMIC0 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_dmic0_cap_ops,
                SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -640,7 +640,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .stream_name = "DMIC1 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_dmic1_cap_ops,
                SND_SOC_DAILINK_REG(designware2, adau, platform),

diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c
index 3756b8bef17bc6ed660339aa815376a5cbdce99b..0193b3eae7a660ae8e4a75fa60e1258a6107a972 100644 (file)
--- a/sound/soc/amd/acp-es8336.c
+++ b/sound/soc/amd/acp-es8336.c
@@ -150,8 +150,6 @@ static struct snd_soc_dai_link st_dai_es8336[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
-               .dpcm_capture = 1,
-               .dpcm_playback = 1,
                .init = st_es8336_init,
                .ops = &st_es8336_ops,
                SND_SOC_DAILINK_REG(designware1, codec, platform),

diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c
index e38b478e15f30779513104c3704f86ec1809c278..67aa0ad83486a3fa016fe45d49c0357223797b11 100644 (file)
--- a/sound/soc/amd/acp/acp-mach-common.c
+++ b/sound/soc/amd/acp/acp-mach-common.c
@@ -1407,8 +1407,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                links[i].num_cpus = ARRAY_SIZE(sof_sp);
                links[i].platforms = sof_component;
                links[i].num_platforms = ARRAY_SIZE(sof_component);
-               links[i].dpcm_playback = 1;
-               links[i].dpcm_capture = 1;
                links[i].nonatomic = true;
                links[i].no_pcm = 1;
                if (!drv_data->hs_codec_id) {
@@ -1444,8 +1442,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                links[i].num_cpus = ARRAY_SIZE(sof_hs);
                links[i].platforms = sof_component;
                links[i].num_platforms = ARRAY_SIZE(sof_component);
-               links[i].dpcm_playback = 1;
-               links[i].dpcm_capture = 1;
                links[i].nonatomic = true;
                links[i].no_pcm = 1;
                if (!drv_data->hs_codec_id) {
@@ -1480,7 +1476,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                }
                links[i].platforms = sof_component;
                links[i].num_platforms = ARRAY_SIZE(sof_component);
-               links[i].dpcm_playback = 1;
+               links[i].playback_only = 1;
                links[i].nonatomic = true;
                links[i].no_pcm = 1;
                if (!drv_data->amp_codec_id) {
@@ -1512,7 +1508,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                links[i].num_cpus = ARRAY_SIZE(sof_hs_virtual);
                links[i].platforms = sof_component;
                links[i].num_platforms = ARRAY_SIZE(sof_component);
-               links[i].dpcm_playback = 1;
+               links[i].playback_only = 1;
                links[i].nonatomic = true;
                links[i].no_pcm = 1;
                if (!drv_data->amp_codec_id) {
@@ -1527,7 +1523,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                        links[i].init = acp_card_maxim_init;
                }
                if (drv_data->amp_codec_id == MAX98388) {
-                       links[i].dpcm_capture = 1;
+                       links[i].playback_only = 0;
                        links[i].codecs = max98388;
                        links[i].num_codecs = ARRAY_SIZE(max98388);
                        links[i].ops = &acp_max98388_ops;
@@ -1553,8 +1549,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                links[i].num_cpus = ARRAY_SIZE(sof_bt);
                links[i].platforms = sof_component;
                links[i].num_platforms = ARRAY_SIZE(sof_component);
-               links[i].dpcm_playback = 1;
-               links[i].dpcm_capture = 1;
                links[i].nonatomic = true;
                links[i].no_pcm = 1;
                if (!drv_data->bt_codec_id) {
@@ -1575,7 +1569,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                links[i].num_cpus = ARRAY_SIZE(sof_dmic);
                links[i].platforms = sof_component;
                links[i].num_platforms = ARRAY_SIZE(sof_component);
-               links[i].dpcm_capture = 1;
+               links[i].capture_only = 1;
                links[i].nonatomic = true;
                links[i].no_pcm = 1;
        }
@@ -1614,8 +1608,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
                links[i].num_cpus = ARRAY_SIZE(i2s_sp);
                links[i].platforms = platform_component;
                links[i].num_platforms = ARRAY_SIZE(platform_component);
-               links[i].dpcm_playback = 1;
-               links[i].dpcm_capture = 1;
                if (!drv_data->hs_codec_id) {
                        /* Use dummy codec if codec id not specified */
                        links[i].codecs = &snd_soc_dummy_dlc;
@@ -1663,8 +1655,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
                        break;
                }
 
-               links[i].dpcm_playback = 1;
-               links[i].dpcm_capture = 1;
                if (!drv_data->hs_codec_id) {
                        /* Use dummy codec if codec id not specified */
                        links[i].codecs = &snd_soc_dummy_dlc;
@@ -1692,7 +1682,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
                links[i].num_cpus = ARRAY_SIZE(i2s_sp);
                links[i].platforms = platform_component;
                links[i].num_platforms = ARRAY_SIZE(platform_component);
-               links[i].dpcm_playback = 1;
+               links[i].playback_only = 1;
                if (!drv_data->amp_codec_id) {
                        /* Use dummy codec if codec id not specified */
                        links[i].codecs = &snd_soc_dummy_dlc;
@@ -1735,7 +1725,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
                        break;
                }
 
-               links[i].dpcm_playback = 1;
+               links[i].playback_only = 1;
                if (!drv_data->amp_codec_id) {
                        /* Use dummy codec if codec id not specified */
                        links[i].codecs = &snd_soc_dummy_dlc;
@@ -1792,7 +1782,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
                        break;
                }
                links[i].ops = &acp_card_dmic_ops;
-               links[i].dpcm_capture = 1;
+               links[i].capture_only = 1;
        }
 
        card->dai_link = links;

diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c
index 357dfd016bafd63df40a3297f8195bc09ec673fa..4ca1978020a9628fd9ed2af9ec63f2b5081cd461 100644 (file)
--- a/sound/soc/amd/acp3x-rt5682-max9836.c
+++ b/sound/soc/amd/acp3x-rt5682-max9836.c
@@ -317,8 +317,6 @@ static struct snd_soc_dai_link acp3x_dai[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .init = acp3x_5682_init,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &acp3x_5682_ops,
                SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform),
        },
@@ -327,7 +325,7 @@ static struct snd_soc_dai_link acp3x_dai[] = {
                .stream_name = "HiFi Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
+               .playback_only = 1,
                .ops = &acp3x_max_play_ops,
                .cpus = acp3x_bt,
                .num_cpus = ARRAY_SIZE(acp3x_bt),
@@ -339,7 +337,7 @@ static struct snd_soc_dai_link acp3x_dai[] = {
                .stream_name = "Capture DMIC0",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .ops = &acp3x_ec_cap0_ops,
                SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform),
        },

diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c
index 7878e061ecb984fb5eb1861a1fc868a2cd27eaa2..2ca904db82abe1f981185df0f4831b95ff53feb9 100644 (file)
--- a/sound/soc/amd/vangogh/acp5x-mach.c
+++ b/sound/soc/amd/vangogh/acp5x-mach.c
@@ -276,8 +276,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &acp5x_8821_ops,
                .init = acp5x_8821_init,
                SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
@@ -288,7 +286,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
                .playback_only = 1,
                .ops = &acp5x_cs35l41_play_ops,
                SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform),
@@ -375,8 +372,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .ops = &acp5x_8821_ops,
                .init = acp5x_8821_init,
                SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
@@ -387,7 +382,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                           SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBC_CFC,
-               .dpcm_playback = 1,
                .playback_only = 1,
                .ops = &acp5x_max98388_play_ops,
                SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform),