Unverified Commit ec15e504 authored Oct 20, 2024 by Kuninori Morimoto Committed by Mark Brown Oct 23, 2024

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>

parent fa9c4b46

sound/soc/mediatek/mt2701/mt2701-cs42448.c

+5 −15

Original line number	Diff line number	Diff line
		@@ -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),
		},
		};

sound/soc/mediatek/mt2701/mt2701-wm8960.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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),
		},
		};

sound/soc/mediatek/mt6797/mt6797-mt6351.c

+7 −17

Original line number	Diff line number	Diff line
		@@ -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),
		},

sound/soc/mediatek/mt7986/mt7986-wm8960.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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),
		},
		};

sound/soc/mediatek/mt8173/mt8173-max98090.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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),
		},
		};