* [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
@ 2024-04-18 4:12 ` Kuninori Morimoto
2024-04-18 16:20 ` Pierre-Louis Bossart
2024-04-18 4:12 ` [PATCH v3 02/23] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings Kuninori Morimoto
` (22 subsequent siblings)
23 siblings, 1 reply; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:12 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
Current soc_get_playback_capture() (A) is checking playback/capture
availability for DPCM (X) / Normal (Y) / Codec2Codec (Z) connections.
(A) static int soc_get_playback_capture(...)
{
...
^ if (dai_link->dynamic || dai_link->no_pcm) {
| ...
|(a) if (dai_link->dpcm_playback) {
| ...
| ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|(*) ...
| v }
| ...
(X) }
|(b) if (dai_link->dpcm_capture) {
| ...
| ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|(*) ...
| v }
| ...
v }
} else {
^ ^ /* Adapt stream for codec2codec links */
|(Z) int cpu_capture = ...
| v int cpu_playback = ...
(Y)
| ^ for_each_rtd_ch_maps(rtd, i, ch_maps) {
|(*) ...
v v }
}
...
}
(*) part is checking each DAI's availability.
(X) part is for DPCM, and it checks playback/capture availability
if dai_link has dpcm_playback/capture flag (a)(b).
This availability check should be available not only for DPCM, but for
all connections. But it is not mandatory option. Let's name it as
assertion.
In case of having assertion flag, non specific side will be disabled.
For example if it has playback_assertion but not have capture_assertion,
capture will be force disabled.
dpcm_playback -> playabck_assertion = 1
dpcm_capture -> capture_assertion = 1
playback_only -> playback_assertion = 1
capture_assertion = 0
capture_only -> playback_assertion = 0
capture_assertion = 1
By expanding this assertion to all connections, we can use same code
for all connections, this means code can be more cleanup.
Here, current CPU / Codec validation check relationship is like this
DPCM
[CPU/xxxx]-[yyyy/Codec]
^^^^ ^^^^
non DPCM
[CPU/Codec]
^^^^^^^^^^^
DPCM part (X) is checking only CPU DAI, and
non DPCM part (Y) is checking both CPU/Codec DAI
Current validation check on DPCM ignores Codec DAI, but there is no
reason to do it. We should check both CPU/Codec in all connection.
This patch expands validation check to all cases.
[CPU/xxxx]-[yyyy/Codec]
*****
In many case (not all case), above [xxxx][yyyy] part are "dummy" DAI
which is always valid for both playback/capture.
But unfortunately DPCM BE Codec (**** part) had been no validation
check before, and some Codec driver doesn't have necessary settings for
it. This means all cases validation check breaks compatibility on some
vender's drivers. Thus this patch temporary uses dummy DAI at BPCM BE
Codec part, and avoid compatibility error. But it should be removed in
the future.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc.h | 9 +++
sound/soc/soc-pcm.c | 143 +++++++++++++++++++++++++-------------------
2 files changed, 92 insertions(+), 60 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0376f7e4c15d..e604d74f6e33 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -809,6 +809,15 @@ struct snd_soc_dai_link {
unsigned int dpcm_capture:1;
unsigned int dpcm_playback:1;
+ /*
+ * Capture / Playback support assertion. Having assertion flag is not mandatory.
+ * In case of having assertion flag, non specific side will be disabled.
+ * see details
+ * soc_get_playback_capture()
+ */
+ unsigned int capture_assertion:1;
+ unsigned int playback_assertion:1;
+
/* DPCM used FE & BE merged format */
unsigned int dpcm_merged_format:1;
/* DPCM used FE & BE merged channel */
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index b0e1bd7f588b..412e7b7d97f5 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2794,7 +2794,12 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
int *playback, int *capture)
{
struct snd_soc_dai_link *dai_link = rtd->dai_link;
+ struct snd_soc_dai_link_ch_map *ch_maps;
struct snd_soc_dai *cpu_dai;
+ struct snd_soc_dai *codec_dai;
+ struct snd_soc_dai *dummy_dai = snd_soc_find_dai(&snd_soc_dummy_dlc);
+ int cpu_playback;
+ int cpu_capture;
int has_playback = 0;
int has_capture = 0;
int i;
@@ -2804,77 +2809,95 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
return -EINVAL;
}
- if (dai_link->dynamic || dai_link->no_pcm) {
- int stream;
-
- if (dai_link->dpcm_playback) {
- stream = SNDRV_PCM_STREAM_PLAYBACK;
-
- for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
- if (snd_soc_dai_stream_valid(cpu_dai, stream)) {
- has_playback = 1;
- break;
- }
- }
- if (!has_playback) {
- dev_err(rtd->card->dev,
- "No CPU DAIs support playback for stream %s\n",
- dai_link->stream_name);
- return -EINVAL;
- }
- }
- if (dai_link->dpcm_capture) {
- stream = SNDRV_PCM_STREAM_CAPTURE;
+ /*
+ * REMOVE ME
+ *
+ * dpcm_playback/capture will be used as playback/capture_assertion
+ */
+ if (dai_link->playback_only && dai_link->capture_only) {
+ dev_err(rtd->dev, "both playback_only / capture_only are set\n");
+ return -EINVAL;
+ }
+ if (dai_link->playback_only)
+ dai_link->playback_assertion = 1;
+ if (dai_link->capture_only)
+ dai_link->capture_assertion = 1;
+ if (dai_link->dpcm_playback)
+ dai_link->playback_assertion = 1;
+ if (dai_link->dpcm_capture)
+ dai_link->capture_assertion = 1;
- for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
- if (snd_soc_dai_stream_valid(cpu_dai, stream)) {
- has_capture = 1;
- break;
- }
- }
+ /* Adapt stream for codec2codec links */
+ cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK);
+ cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE);
- if (!has_capture) {
- dev_err(rtd->card->dev,
- "No CPU DAIs support capture for stream %s\n",
- dai_link->stream_name);
- return -EINVAL;
- }
- }
- } else {
- struct snd_soc_dai_link_ch_map *ch_maps;
- struct snd_soc_dai *codec_dai;
-
- /* Adapt stream for codec2codec links */
- int cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE);
- int cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK);
+ /*
+ * see
+ * soc.h :: [dai_link->ch_maps Image sample]
+ */
+ for_each_rtd_ch_maps(rtd, i, ch_maps) {
+ cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu);
+ codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec);
/*
- * see
- * soc.h :: [dai_link->ch_maps Image sample]
+ * FIXME
+ *
+ * DPCM BE Codec has been no checked before.
+ * It should be checked, but it breaks compatibility.
+ * It ignores BE Codec here, so far.
*/
- for_each_rtd_ch_maps(rtd, i, ch_maps) {
- cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu);
- codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec);
-
- if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
- snd_soc_dai_stream_valid(cpu_dai, cpu_playback))
- has_playback = 1;
- if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) &&
- snd_soc_dai_stream_valid(cpu_dai, cpu_capture))
- has_capture = 1;
- }
- }
+ if (dai_link->no_pcm)
+ codec_dai = dummy_dai;
- if (dai_link->playback_only)
- has_capture = 0;
+ if (snd_soc_dai_stream_valid(cpu_dai, cpu_playback) &&
+ snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK))
+ has_playback = 1;
+ if (snd_soc_dai_stream_valid(cpu_dai, cpu_capture) &&
+ snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE))
+ has_capture = 1;
+ }
- if (dai_link->capture_only)
- has_playback = 0;
+ /*
+ * Assertion check
+ *
+ * playback_assertion = 0 No assertion check.
+ * capture_assertion = 0 ASoC will use detected playback/capture as-is.
+ * No playback, No capture will be error.
+ *
+ * playback_assertion = 1 DAI must playback available. ASoC will disable capture.
+ * capture_assertion = 0 In other words "playback_only"
+ *
+ * playback_assertion = 0 DAI must capture available. ASoC will disable playback.
+ * capture_assertion = 1 In other words "capture_only"
+ *
+ * playback_assertion = 1 DAI must both playback/capture available.
+ * capture_assertion = 1
+ */
+ if (dai_link->playback_assertion) {
+ if (!has_playback) {
+ dev_err(rtd->dev, "%s playback assertion check error\n", dai_link->stream_name);
+ return -EINVAL;
+ }
+ /* makes it plyaback only */
+ if (!dai_link->capture_assertion)
+ has_capture = 0;
+ }
+ if (dai_link->capture_assertion) {
+ if (!has_capture) {
+ dev_err(rtd->dev, "%s capture assertion check error\n", dai_link->stream_name);
+ return -EINVAL;
+ }
+ /* makes it capture only */
+ if (!dai_link->playback_assertion)
+ has_playback = 0;
+ }
+ /*
+ * Detect Mismatch
+ */
if (!has_playback && !has_capture) {
dev_err(rtd->dev, "substream %s has no playback, no capture\n",
dai_link->stream_name);
-
return -EINVAL;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-18 4:12 ` [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture() Kuninori Morimoto
@ 2024-04-18 16:20 ` Pierre-Louis Bossart
2024-04-19 1:09 ` Kuninori Morimoto
0 siblings, 1 reply; 39+ messages in thread
From: Pierre-Louis Bossart @ 2024-04-18 16:20 UTC (permalink / raw)
To: Kuninori Morimoto, Amadeusz Sławiński,
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi, Ranjani Sridharan,
Sascha Hauer, Shawn Guo, Shengjiu Wang, Srinivas Kandagatla,
Sylwester Nawrocki, Takashi Iwai, Vinod Koul, Xiubo Li,
alsa-devel, imx, linux-doc, linux-sound
> (X) part is for DPCM, and it checks playback/capture availability
> if dai_link has dpcm_playback/capture flag (a)(b).
> This availability check should be available not only for DPCM, but for
> all connections. But it is not mandatory option. Let's name it as
> assertion.
I don't follow the 'not mandatory option'. Why not make these
'assertions' mandatory? What happens in case the the option is not present?
> In case of having assertion flag, non specific side will be disabled.
Not following the wording, multiple negatives and not clear on what
'side' refers to (direction or DPCM/non-DPCM).
> For example if it has playback_assertion but not have capture_assertion,
> capture will be force disabled.
>
> dpcm_playback -> playabck_assertion = 1
>
> dpcm_capture -> capture_assertion = 1
>
> playback_only -> playback_assertion = 1
> capture_assertion = 0
>
> capture_only -> playback_assertion = 0
> capture_assertion = 1
>
> By expanding this assertion to all connections, we can use same code
> for all connections, this means code can be more cleanup.
I see a contradiction between "expanding the assertion to all
connections" and "not mandatory".
> Current validation check on DPCM ignores Codec DAI, but there is no
> reason to do it. We should check both CPU/Codec in all connection.
"there's no reason to do so" ?
> This patch expands validation check to all cases.
>
> [CPU/xxxx]-[yyyy/Codec]
> *****
>
> In many case (not all case), above [xxxx][yyyy] part are "dummy" DAI
> which is always valid for both playback/capture.
> But unfortunately DPCM BE Codec (**** part) had been no validation
> check before, and some Codec driver doesn't have necessary settings for
> it. This means all cases validation check breaks compatibility on some
> vender's drivers. Thus this patch temporary uses dummy DAI at BPCM BE
vendor
> Codec part, and avoid compatibility error. But it should be removed in
> the future.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> include/sound/soc.h | 9 +++
> sound/soc/soc-pcm.c | 143 +++++++++++++++++++++++++-------------------
> 2 files changed, 92 insertions(+), 60 deletions(-)
>
> diff --git a/include/sound/soc.h b/include/sound/soc.h
> index 0376f7e4c15d..e604d74f6e33 100644
> --- a/include/sound/soc.h
> +++ b/include/sound/soc.h
> @@ -809,6 +809,15 @@ struct snd_soc_dai_link {
> unsigned int dpcm_capture:1;
> unsigned int dpcm_playback:1;
>
> + /*
> + * Capture / Playback support assertion. Having assertion flag is not mandatory.
> + * In case of having assertion flag, non specific side will be disabled.
again the 'not mandatory' and 'non specific side will be disabled' are
confusing.
> + /*
> + * Assertion check
> + *
> + * playback_assertion = 0 No assertion check.
> + * capture_assertion = 0 ASoC will use detected playback/capture as-is.
> + * No playback, No capture will be error.
did you mean "this combination will be handled as an error" ?
It's probably best to have a different presentation, to avoid
confusions. Using multiple lines without a separator isn't great.
Suggested example:
playback_assertion = 0 capture_assertion = 0
this combination will be handled as an error
playback_assertion = 1 capture_assertion = 0
the DAIs in this dailink must support playback.
ASoC will disable capture.
In other words "playback_only"
> + *
> + * playback_assertion = 1 DAI must playback available. ASoC will disable capture.
> + * capture_assertion = 0 In other words "playback_only"
> + *
> + * playback_assertion = 0 DAI must capture available. ASoC will disable playback.
> + * capture_assertion = 1 In other words "capture_only"
> + *
> + * playback_assertion = 1 DAI must both playback/capture available.
> + * capture_assertion = 1
nit-pick: the 'must X available' does not read well, 'must support X' is
probably what you meant.
> + */
> + if (dai_link->playback_assertion) {
> + if (!has_playback) {
> + dev_err(rtd->dev, "%s playback assertion check error\n", dai_link->stream_name);
"invalid playback_assertion" ?
> + return -EINVAL;
> + }
> + /* makes it plyaback only */
typo: playback
> + if (!dai_link->capture_assertion)
> + has_capture = 0;
> + }
> + if (dai_link->capture_assertion) {
> + if (!has_capture) {
> + dev_err(rtd->dev, "%s capture assertion check error\n", dai_link->stream_name);
> + return -EINVAL;
> + }
> + /* makes it capture only */
> + if (!dai_link->playback_assertion)
> + has_playback = 0;
> + }
we probably want a dev_ log when the has_playback/capture is overridden?
>
> + /*
> + * Detect Mismatch
> + */
> if (!has_playback && !has_capture) {
> dev_err(rtd->dev, "substream %s has no playback, no capture\n",
> dai_link->stream_name);
> -
> return -EINVAL;
> }
>
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-18 16:20 ` Pierre-Louis Bossart
@ 2024-04-19 1:09 ` Kuninori Morimoto
2024-04-19 13:17 ` Pierre-Louis Bossart
0 siblings, 1 reply; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-19 1:09 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Amadeusz Sławiński, Alexandre Belloni,
Alper Nebi Yasak, AngeloGioacchino Del Regno, Banajit Goswami,
Bard Liao, Brent Lu, Cezary Rojewski, Charles Keepax,
Claudiu Beznea, Cristian Ciocaltea, Daniel Baluta, Hans de Goede,
Jaroslav Kysela, Jerome Brunet, Jiawei Wang, Jonathan Corbet,
Kai Vehmanen, Kevin Hilman, Liam Girdwood, Mark Brown,
Maso Huang, Matthias Brugger, Neil Armstrong, Nicolas Ferre,
Peter Ujfalusi, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
Hi Pierre-Louis
> > (X) part is for DPCM, and it checks playback/capture availability
> > if dai_link has dpcm_playback/capture flag (a)(b).
> > This availability check should be available not only for DPCM, but for
> > all connections. But it is not mandatory option. Let's name it as
> > assertion.
>
> I don't follow the 'not mandatory option'. Why not make these
> 'assertions' mandatory? What happens in case the the option is not present?
The big reason why "assertion flag" is not mandatory is that non-DPCM doesn't
have such flag before. I can't add such flags to all of non-DPCM,
because I don't know which direction (playback/capture) is available on
each DAIs.
> > In case of having assertion flag, non specific side will be disabled.
>
> Not following the wording, multiple negatives and not clear on what
> 'side' refers to (direction or DPCM/non-DPCM).
How about this ?
If either playback or capture assertion flag was presented,
not presented direction will be disabled by ASoC even if
it was available.
> I see a contradiction between "expanding the assertion to all
> connections" and "not mandatory".
(snip)
> again the 'not mandatory' and 'non specific side will be disabled' are
> confusing.
(snip)
> > + /*
> > + * Assertion check
> > + *
> > + * playback_assertion = 0 No assertion check.
> > + * capture_assertion = 0 ASoC will use detected playback/capture as-is.
> > + * No playback, No capture will be error.
>
> did you mean "this combination will be handled as an error" ?
Hmm... is it word selection issue ?? is "must_support" better ?
(playback_xxx, capture_xxx)
(0, 0) : Both are not must item. available direction is used as-is.
But it will be error if nothing was available.
(1, 0) : DAI must support selected direction.
(0, 1) Not selected direction will be disabled even though it was available
(1, 1) : Both must be supported.
> It's probably best to have a different presentation, to avoid
> confusions. Using multiple lines without a separator isn't great.
>
> Suggested example:
>
> playback_assertion = 0 capture_assertion = 0
> this combination will be handled as an error
>
> playback_assertion = 1 capture_assertion = 0
> the DAIs in this dailink must support playback.
> ASoC will disable capture.
> In other words "playback_only"
Yeah, I agree
> > + * playback_assertion = 1 DAI must playback available. ASoC will disable capture.
> > + * capture_assertion = 0 In other words "playback_only"
> > + *
> > + * playback_assertion = 0 DAI must capture available. ASoC will disable playback.
> > + * capture_assertion = 1 In other words "capture_only"
> > + *
> > + * playback_assertion = 1 DAI must both playback/capture available.
> > + * capture_assertion = 1
>
> nit-pick: the 'must X available' does not read well, 'must support X' is
> probably what you meant.
Thanks. will fix in v4
> > + if (dai_link->capture_assertion) {
> > + if (!has_capture) {
> > + dev_err(rtd->dev, "%s capture assertion check error\n", dai_link->stream_name);
> > + return -EINVAL;
> > + }
> > + /* makes it capture only */
> > + if (!dai_link->playback_assertion)
> > + has_playback = 0;
> > + }
>
> we probably want a dev_ log when the has_playback/capture is overridden?
OK, will do in v4
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-19 1:09 ` Kuninori Morimoto
@ 2024-04-19 13:17 ` Pierre-Louis Bossart
2024-04-22 4:46 ` Kuninori Morimoto
0 siblings, 1 reply; 39+ messages in thread
From: Pierre-Louis Bossart @ 2024-04-19 13:17 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: Amadeusz Sławiński, Alexandre Belloni,
Alper Nebi Yasak, AngeloGioacchino Del Regno, Banajit Goswami,
Bard Liao, Brent Lu, Cezary Rojewski, Charles Keepax,
Claudiu Beznea, Cristian Ciocaltea, Daniel Baluta, Hans de Goede,
Jaroslav Kysela, Jerome Brunet, Jiawei Wang, Jonathan Corbet,
Kai Vehmanen, Kevin Hilman, Liam Girdwood, Mark Brown,
Maso Huang, Matthias Brugger, Neil Armstrong, Nicolas Ferre,
Peter Ujfalusi, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
>>> (X) part is for DPCM, and it checks playback/capture availability
>>> if dai_link has dpcm_playback/capture flag (a)(b).
>>> This availability check should be available not only for DPCM, but for
>>> all connections. But it is not mandatory option. Let's name it as
>>> assertion.
>>
>> I don't follow the 'not mandatory option'. Why not make these
>> 'assertions' mandatory? What happens in case the the option is not present?
>
> The big reason why "assertion flag" is not mandatory is that non-DPCM doesn't
> have such flag before. I can't add such flags to all of non-DPCM,
> because I don't know which direction (playback/capture) is available on
> each DAIs.
Your explanation seems to contradict the sentence above "This
availability check should be available not only for DPCM, but for all
connections."
Can we actually do this 'availability check' for non-DPCM connections.
>>> In case of having assertion flag, non specific side will be disabled.
>>
>> Not following the wording, multiple negatives and not clear on what
>> 'side' refers to (direction or DPCM/non-DPCM).
>
> How about this ?
>
> If either playback or capture assertion flag was presented,
> not presented direction will be disabled by ASoC even if
> it was available.
Did you mean
"
The playback (resp. capture) direction will be disabled by ASoC if the
playback_assertion (resp. capture) flag is false - even if this
direction was available at the DAI level
"
> (playback_xxx, capture_xxx)
>
> (0, 0) : Both are not must item. available direction is used as-is.
> But it will be error if nothing was available.
That new wording makes me even more confused. What does 'available'
refer to and at which level is this?
This seems also to contradict the definitions above, "available
direction is used as-is" is not aligned with "not presented direction
will be disabled by ASoC even if it was available".
> (1, 0) : DAI must support selected direction.
> (0, 1) Not selected direction will be disabled even though it was available
>
> (1, 1) : Both must be supported.
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-19 13:17 ` Pierre-Louis Bossart
@ 2024-04-22 4:46 ` Kuninori Morimoto
2024-04-22 20:12 ` Pierre-Louis Bossart
0 siblings, 1 reply; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-22 4:46 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Amadeusz Sławiński, Alexandre Belloni,
Alper Nebi Yasak, AngeloGioacchino Del Regno, Banajit Goswami,
Bard Liao, Brent Lu, Cezary Rojewski, Charles Keepax,
Claudiu Beznea, Cristian Ciocaltea, Daniel Baluta, Hans de Goede,
Jaroslav Kysela, Jerome Brunet, Jiawei Wang, Jonathan Corbet,
Kai Vehmanen, Kevin Hilman, Liam Girdwood, Mark Brown,
Maso Huang, Matthias Brugger, Neil Armstrong, Nicolas Ferre,
Peter Ujfalusi, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
Hi Pierre-Louis
Cc Mark
> Your explanation seems to contradict the sentence above "This
> availability check should be available not only for DPCM, but for all
> connections."
>
> Can we actually do this 'availability check' for non-DPCM connections.
>
> > How about this ?
> >
> > If either playback or capture assertion flag was presented,
> > not presented direction will be disabled by ASoC even if
> > it was available.
>
> Did you mean
>
> "
> The playback (resp. capture) direction will be disabled by ASoC if the
> playback_assertion (resp. capture) flag is false - even if this
> direction was available at the DAI level
> "
> > (0, 0) : Both are not must item. available direction is used as-is.
> > But it will be error if nothing was available.
>
> That new wording makes me even more confused. What does 'available'
> refer to and at which level is this?
>
> This seems also to contradict the definitions above, "available
> direction is used as-is" is not aligned with "not presented direction
> will be disabled by ASoC even if it was available".
It is complicated by the attempt to merge dpcm_xxx and xxx_only flags.
And I noticed that my one of other attemption was not indicated.
Let's cleanup what does this patch-set want to do
I still wondering why dpcm_xxx flag itself is needed.
(A) Before, it checks channels_min for DPCM, same as current non-DPCM.
This is very clear for me. Let's name this as "validation check"
if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
if (cpu_dai->driver->playback.channels_min)
playback = 1;
if (cpu_dai->driver->capture.channels_min)
capture = 1;
(B) commit 1e9de42f4324b91ce2e9da0939cab8fc6ae93893
("Explicitly set BE DAI link supported stream directions") force use to
dpcm_xxx flag
if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
playback = rtd->dai_link->dpcm_playback;
capture = rtd->dai_link->dpcm_capture;
(C) 9b5db059366ae2087e07892b5fc108f81f4ec189
("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported")
checks channels_min (= validation check) again
if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
cpu_dai = asoc_rtd_to_cpu(rtd, 0);
...
playback = rtd->dai_link->dpcm_playback &&
snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK);
capture = rtd->dai_link->dpcm_capture &&
snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE);
(D) b73287f0b0745961b14e5ebcce92cc8ed24d4d52
("ASoC: soc-pcm: dpcm: fix playback/capture checks") expanded it to
multi connection.
So, I would say nothing has changed, but become more complicated.
Or if (B) added dpcm_xxx as "option flag", it was understandable for me.
like this
if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
playback = (cpu_dai->driver->playback.channels_min > 0) ||
rtd->dai_link->dpcm_playback;
capture = (cpu_dai->driver->capture.channels_min > 0) ||
rtd->dai_link->dpcm_capture;
So my opinion is this dpcm_xxx is unnecessary flag that only complicate
matters. I guess almost all Card don't need this flag, this means
"validation check" only is veryenough, same as current non-DPCM.
But because of these history, dpcm_xxx flag have been used as
"passage permit" or "gate way". It doesn't try to "validation check" if
dpcm_xxx flag was not set. This is the reason why I try to merge
dpcm_xxx and xxx_only flag. These are doing the same things with
dirrerent flags, IMO.
OTOH, some Card want to detect error if expected direction
(playback/capture) was not valid. I guess this is your commitment (?).
So, let's keep xxx_only flag as-is, and use dpcm_xxx as "available_check".
I'm not sure what is the good naming, but for example
"playback_available_check" flag means "owner is expecting playback is
valid/available, and want to receive error if not".
I'm not sure how many owner want this flag, thus I think "option flag"
is very enough (= not mandatory, as I mentioned in the patch-set).
If we makes these checks generalize,
For DPCM, (for example new DPCM) it can remove/ignore "available_check"
flag if it don't need, same as current non-DPCM.
And for non-DPCM, it can use "available_check" if needed,
same as current DPCM.
What do you think ? what is your opinion ?
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-22 4:46 ` Kuninori Morimoto
@ 2024-04-22 20:12 ` Pierre-Louis Bossart
2024-04-23 4:56 ` Kuninori Morimoto
0 siblings, 1 reply; 39+ messages in thread
From: Pierre-Louis Bossart @ 2024-04-22 20:12 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: Amadeusz Sławiński, Alexandre Belloni,
Alper Nebi Yasak, AngeloGioacchino Del Regno, Banajit Goswami,
Bard Liao, Brent Lu, Cezary Rojewski, Charles Keepax,
Claudiu Beznea, Cristian Ciocaltea, Daniel Baluta, Hans de Goede,
Jaroslav Kysela, Jerome Brunet, Jiawei Wang, Jonathan Corbet,
Kai Vehmanen, Kevin Hilman, Liam Girdwood, Mark Brown,
Maso Huang, Matthias Brugger, Neil Armstrong, Nicolas Ferre,
Peter Ujfalusi, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
Hi Morimoto-san,
> I still wondering why dpcm_xxx flag itself is needed.
That's an excellent question indeed. And since you started a historical
review, we can get a lot of information.
> (A) Before, it checks channels_min for DPCM, same as current non-DPCM.
> This is very clear for me. Let's name this as "validation check"
>
> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> if (cpu_dai->driver->playback.channels_min)
> playback = 1;
> if (cpu_dai->driver->capture.channels_min)
> capture = 1;
>
> (B) commit 1e9de42f4324b91ce2e9da0939cab8fc6ae93893
> ("Explicitly set BE DAI link supported stream directions") force use to
> dpcm_xxx flag
>
> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> playback = rtd->dai_link->dpcm_playback;
> capture = rtd->dai_link->dpcm_capture;
The reason for this (B) addition is very clear from the commit message
"
Some BE DAIs can be "dummy" (when the DSP is controlling the DAI) and as
such wont have set a minimum number of playback or capture channels
required for BE DAI registration (to establish supported stream directions).
"
So (B) introduced these dpcm_xxx flags as override mechanisms, where the
dailink information matters more than the dai information.
> (C) 9b5db059366ae2087e07892b5fc108f81f4ec189
> ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported")
> checks channels_min (= validation check) again
>
> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> cpu_dai = asoc_rtd_to_cpu(rtd, 0);
> ...
> playback = rtd->dai_link->dpcm_playback &&
> snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK);
> capture = rtd->dai_link->dpcm_capture &&
> snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE);
It helps to look at the commit message in detail:
"
Normally the dpcm_playback/capture parameter should match the
capabilities of the CPU DAI. However, there is no way to set that
parameter from the device tree (e.g. with simple-audio-card or
qcom sound cards). dpcm_playback/capture are always both set to 1.
"
This is where the direction changed from "dpcm_xxx" being override of
DAI capabilities to "dpcm_xxx" being required to match DAI capabilities,
because some machine drivers incorrectly did an override that made no
sense...
(C) is essentially (A) && (B)
Clearly there's a contradiction. If (C) was the correct solution, then
it would revert the direction in (A) and report an error for dummy dais.
It's been my question from the beginning of this thread, when the
direction information can come from 2 sources, which one do we trust?
> (D) b73287f0b0745961b14e5ebcce92cc8ed24d4d52
> ("ASoC: soc-pcm: dpcm: fix playback/capture checks") expanded it to
> multi connection.
You really want to look at
(E) 4f8721542f7b75954bfad98c51aa59d683d35b50
("ASoC: core: use less strict tests for dailink capabilities")
"
This patch modifies the snd_soc_dai_link_set_capabilities() helper so
that the dpcm_playback (resp. dpcm_capture) dailink capabilities are set
if at least one dai supports playback (resp. capture).
Likewise the checks are modified so that an error is reported only
when dpcm_playback (resp. dpcm_capture) is set but none of the CPU
DAIs support playback (resp. capture).
"
This one has not fundamentally changed the reasons why (C) was
introduced, the requirement is that dpcm_xxx be aligned with at least
ONE DAI capability. It's still not clear how dummy-dais would be handled
since the number of channels may or may not be set for those dummy-dais.
> So, I would say nothing has changed, but become more complicated.
It's not really become more complicated, the open is which of (B) or (C)
are correct.
> Or if (B) added dpcm_xxx as "option flag", it was understandable for me.
> like this
>
> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> playback = (cpu_dai->driver->playback.channels_min > 0) ||
> rtd->dai_link->dpcm_playback;
> capture = (cpu_dai->driver->capture.channels_min > 0) ||
> rtd->dai_link->dpcm_capture;
That would essentially revert (C), since the direction would ignore the
actual capabilities of the DAI.
IMHO, we should really try with this revert and go back to the initial
definition of (A), where dpcm_xxx is an optional escape mechanism to
allow machine drivers to set the direction. I would guess that would
impact mostly DT/simple-card users and Qualcomm, if the commit message
of (C) is still relevant.
Then we can discuss about merging code and removing flags. For now we
have different directions/opinions on something that's 10 years old,
last modified 4 years ago. We will break lots of eggs if we don't first
agree on what works and what doesn't.
This 23-patch code merge/simplification is premature at this point IMHO,
we should first land in a state where everyone is happy with how
dpcm_xxx flags need to be handled. We can merge dpcm_xxx and xxx_only
flags later when we understand what they are supposed to do...
And now I need a coffee refill :-)
Regards,
-Pierre
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-22 20:12 ` Pierre-Louis Bossart
@ 2024-04-23 4:56 ` Kuninori Morimoto
2024-04-25 5:32 ` Kuninori Morimoto
0 siblings, 1 reply; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-23 4:56 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Amadeusz Sławiński, Alexandre Belloni,
Alper Nebi Yasak, AngeloGioacchino Del Regno, Banajit Goswami,
Bard Liao, Brent Lu, Cezary Rojewski, Charles Keepax,
Claudiu Beznea, Cristian Ciocaltea, Daniel Baluta, Hans de Goede,
Jaroslav Kysela, Jerome Brunet, Jiawei Wang, Jonathan Corbet,
Kai Vehmanen, Kevin Hilman, Liam Girdwood, Mark Brown,
Maso Huang, Matthias Brugger, Neil Armstrong, Nicolas Ferre,
Peter Ujfalusi, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
Hi Pierre-Louis
Thank you for your feedback
> > (B) commit 1e9de42f4324b91ce2e9da0939cab8fc6ae93893
> > ("Explicitly set BE DAI link supported stream directions") force use to
> > dpcm_xxx flag
> >
> > if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> > playback = rtd->dai_link->dpcm_playback;
> > capture = rtd->dai_link->dpcm_capture;
>
> The reason for this (B) addition is very clear from the commit message
>
> "
> Some BE DAIs can be "dummy" (when the DSP is controlling the DAI) and as
> such wont have set a minimum number of playback or capture channels
> required for BE DAI registration (to establish supported stream directions).
> "
I'm still not yet 100% understand around this "dummy" DAI, but is it
*not* soc-utils.c :: dummy_dai, but some original dummy DAI is used
somewhere ?
I know ${LINUX}/sound/soc/codecs/hda.c :: card_binder_dai is one of
the DAI which is used but doesn't have channels_min.
I think it is used as BE "Codec", but code is checking "CPU" side.
Do you know what does this "BE dummy DAI" specifically means here?
> > Or if (B) added dpcm_xxx as "option flag", it was understandable for me.
> > like this
> >
> > if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> > playback = (cpu_dai->driver->playback.channels_min > 0) ||
> > rtd->dai_link->dpcm_playback;
> > capture = (cpu_dai->driver->capture.channels_min > 0) ||
> > rtd->dai_link->dpcm_capture;
>
> That would essentially revert (C), since the direction would ignore the
> actual capabilities of the DAI.
>
> IMHO, we should really try with this revert and go back to the initial
> definition of (A), where dpcm_xxx is an optional escape mechanism to
> allow machine drivers to set the direction. I would guess that would
> impact mostly DT/simple-card users and Qualcomm, if the commit message
> of (C) is still relevant.
I can agree that above code makes dpcm_xxx flag option, and allow to
machine drivers to set direction without thinking actual DAI capabilities.
I think it is effective if it was around (C) timing.
(A) : checked CPU capabilities
(B) : uses dpcm_xxx flag
(C) : checks both dpcm_xxx and capabilities
...
But *current* ASoC is checking both "actual capabilities" and "dpcm_xxx"
flag in the same time, and have no problems today.
Around (A)-(B) timing, some DAI had issue (= channels_min was not set).
Let's name it as "no_chan_DAI". It should be CPU DAI and used as BE
if my understanding was correct.
Because "no_chan_DAI" exist, (B) was added.
But after that (C) was added, and it checks channels_min again.
It continues today. This means "no_chan_DAI" today have channels_min,
otherwise it can't work today.
If my above understanding were all correct, do we still need dpcm_xxx ?
because "no_chan_DAI" is no longer exist.
Just remove dpcm_xxx seems no problem, I guess...
> Then we can discuss about merging code and removing flags. For now we
> have different directions/opinions on something that's 10 years old,
> last modified 4 years ago. We will break lots of eggs if we don't first
> agree on what works and what doesn't.
>
> This 23-patch code merge/simplification is premature at this point IMHO,
> we should first land in a state where everyone is happy with how
> dpcm_xxx flags need to be handled. We can merge dpcm_xxx and xxx_only
> flags later when we understand what they are supposed to do...
Thank you for your help. The problem becoming more clear.
Let's focus to "revert C code" or "remove dpcm_xxx" first.
> And now I need a coffee refill :-)
Enjoy :)
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-23 4:56 ` Kuninori Morimoto
@ 2024-04-25 5:32 ` Kuninori Morimoto
2024-04-25 15:20 ` Pierre-Louis Bossart
0 siblings, 1 reply; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-25 5:32 UTC (permalink / raw)
To: Pierre-Louis Bossart, Mark Brown; +Cc: alsa-devel, linux-sound
Hi Pierre-Louis, Mark
Because Japanese will dive into long vacation since next week,
I want to post mail before that. I will back at 7th May.
> > > (B) commit 1e9de42f4324b91ce2e9da0939cab8fc6ae93893
> > > ("Explicitly set BE DAI link supported stream directions") force use to
> > > dpcm_xxx flag
> > >
> > > if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> > > playback = rtd->dai_link->dpcm_playback;
> > > capture = rtd->dai_link->dpcm_capture;
> >
> > The reason for this (B) addition is very clear from the commit message
> >
> > "
> > Some BE DAIs can be "dummy" (when the DSP is controlling the DAI) and as
> > such wont have set a minimum number of playback or capture channels
> > required for BE DAI registration (to establish supported stream directions).
> > "
>
> I'm still not yet 100% understand around this "dummy" DAI, but is it
> *not* soc-utils.c :: dummy_dai, but some original dummy DAI is used
> somewhere ?
>
> I know ${LINUX}/sound/soc/codecs/hda.c :: card_binder_dai is one of
> the DAI which is used but doesn't have channels_min.
> I think it is used as BE "Codec", but code is checking "CPU" side.
>
> Do you know what does this "BE dummy DAI" specifically means here?
(A) : checked CPU capabilities
(B) : uses dpcm_xxx flag
(C) : checks both dpcm_xxx and capabilities
...
In my understanding, in summary, this dpcm_xxx flag was added to rescue
dummy DAI which is used on DCPM BE as CPU at (B), because some of them
might not have channels_min (This "dummy DAI" is not same as soc-utils's
dummy DAI). Let's name it as "no_chan_DAI" here.
In this patch, it was added as "mandatory flag", not "option flag",
thus all DPCM needed to use this dpcm_xxx flag.
After that (C) was added, but it was contradiction, because
it checks both dpcm_xxx and channels_min.
If my understanding was correct, original "no_chan_DAI" was supposed to
stop working, because it doesn't have channels_min. But there is no
such report after (C), during this 4 years.
We don't know which DAI is the "no_chan_DAI" (?)
Possibilities are as follows
- No one is using "no_chan_DAI"
- "no_chan_DAI" is no longer exist : it was removed ?
- "no_chan_DAI" is no longer exist : it has channels_min ?
If my expectation was correct, we don't need dpcm_xxx anymore.
But because we have been used dpcm_xxx for 10 years since (B),
I understand to feel anxious to suddenly remove dpcm_xxx.
I think it should be removed anyway, but want to have grace time ?
If so, the idea is that we can use it as "option flag" instead of
"mandatory flag" for a while, like below
if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
playback = (cpu_dai->driver->playback.channels_min > 0) ||
rtd->dai_link->dpcm_playback;
capture = (cpu_dai->driver->capture.channels_min > 0) ||
rtd->dai_link->dpcm_capture;
* maybe we want to indicate message like "place re-check the flag and
remove it" via dev_info() if dpcm_xxx flag was used ?
I think +2 kernel version or so is enough for grace time ?
After that, we can remove dpcm_xxx flag.
When we consider it very detail, above code can't 100% keep compatibility
if the user have been used this dpcm_xxx flag to limit availability,
for example in case of DAI can use both playback/capture, but it had
dpcm_playback flag only. But it can use playback_only flag, instead.
But it is very difficult to find such DAI. Each user need to check.
I personally think that remove dpcm_xxx directly is no ploblem, but what
do you think ? I'm happy to hear any opinion, and happy to create
grace time code if someone want, but if there was no comment during
Japanese long vacation, I will create patch to remove dpcm_xxx directly.
BTW, I would like to know detail things around this topic. I'm happy if
someone knows it.
* Why dummy DAI doesn't/can't have channels_min ?
* Why it checks CPU side channels_min only when DPCM ?
I think it should check both CPU and Codec.
I could understand if it checks FE:CPU and BE:Codec (it is assuming
other side was dummy), but both (FE/BE) check CPU side only...
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-25 5:32 ` Kuninori Morimoto
@ 2024-04-25 15:20 ` Pierre-Louis Bossart
2024-04-25 21:59 ` Pierre-Louis Bossart
0 siblings, 1 reply; 39+ messages in thread
From: Pierre-Louis Bossart @ 2024-04-25 15:20 UTC (permalink / raw)
To: Kuninori Morimoto, Mark Brown; +Cc: alsa-devel, linux-sound
> Because Japanese will dive into long vacation since next week,
> I want to post mail before that. I will back at 7th May.
Enjoy!
>>>> (B) commit 1e9de42f4324b91ce2e9da0939cab8fc6ae93893
>>>> ("Explicitly set BE DAI link supported stream directions") force use to
>>>> dpcm_xxx flag
>>>>
>>>> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
>>>> playback = rtd->dai_link->dpcm_playback;
>>>> capture = rtd->dai_link->dpcm_capture;
>>>
>>> The reason for this (B) addition is very clear from the commit message
>>>
>>> "
>>> Some BE DAIs can be "dummy" (when the DSP is controlling the DAI) and as
>>> such wont have set a minimum number of playback or capture channels
>>> required for BE DAI registration (to establish supported stream directions).
>>> "
>>
>> I'm still not yet 100% understand around this "dummy" DAI, but is it
>> *not* soc-utils.c :: dummy_dai, but some original dummy DAI is used
>> somewhere ?
>>
>> I know ${LINUX}/sound/soc/codecs/hda.c :: card_binder_dai is one of
>> the DAI which is used but doesn't have channels_min.
>> I think it is used as BE "Codec", but code is checking "CPU" side.
>>
>> Do you know what does this "BE dummy DAI" specifically means here?
>
> (A) : checked CPU capabilities
> (B) : uses dpcm_xxx flag
> (C) : checks both dpcm_xxx and capabilities
> ...
>
> In my understanding, in summary, this dpcm_xxx flag was added to rescue
> dummy DAI which is used on DCPM BE as CPU at (B), because some of them
> might not have channels_min (This "dummy DAI" is not same as soc-utils's
> dummy DAI). Let's name it as "no_chan_DAI" here.
> In this patch, it was added as "mandatory flag", not "option flag",
> thus all DPCM needed to use this dpcm_xxx flag.
>
> After that (C) was added, but it was contradiction, because
> it checks both dpcm_xxx and channels_min.
> If my understanding was correct, original "no_chan_DAI" was supposed to
> stop working, because it doesn't have channels_min. But there is no
> such report after (C), during this 4 years.
> We don't know which DAI is the "no_chan_DAI" (?)
>
> Possibilities are as follows
> - No one is using "no_chan_DAI"
> - "no_chan_DAI" is no longer exist : it was removed ?
> - "no_chan_DAI" is no longer exist : it has channels_min ?
>
> If my expectation was correct, we don't need dpcm_xxx anymore.
I agree with your analysis. We don't have a clear memory/understanding
of which "no_chan_DAI" platforms (B) was supposed to handle, and why no
one reported them as broken by (C).
> But because we have been used dpcm_xxx for 10 years since (B),
> I understand to feel anxious to suddenly remove dpcm_xxx.
Indeed we err on the side of paranoia with such changes!
> I think it should be removed anyway, but want to have grace time ?
> If so, the idea is that we can use it as "option flag" instead of
> "mandatory flag" for a while, like below
>
> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> playback = (cpu_dai->driver->playback.channels_min > 0) ||
> rtd->dai_link->dpcm_playback;
> capture = (cpu_dai->driver->capture.channels_min > 0) ||
> rtd->dai_link->dpcm_capture;
>
> * maybe we want to indicate message like "place re-check the flag and
> remove it" via dev_info() if dpcm_xxx flag was used ?
>
> I think +2 kernel version or so is enough for grace time ?
> After that, we can remove dpcm_xxx flag.
I am good with that plan, but I'll need to investigate first why we had
a failure with one of the Chromebooks on this v3 patchset. That may give
us some insights on "special" uses of those flags.
> When we consider it very detail, above code can't 100% keep compatibility
> if the user have been used this dpcm_xxx flag to limit availability,
> for example in case of DAI can use both playback/capture, but it had
> dpcm_playback flag only. But it can use playback_only flag, instead.
> But it is very difficult to find such DAI. Each user need to check.
>
> I personally think that remove dpcm_xxx directly is no ploblem, but what
> do you think ? I'm happy to hear any opinion, and happy to create
> grace time code if someone want, but if there was no comment during
> Japanese long vacation, I will create patch to remove dpcm_xxx directly.
>
>
> BTW, I would like to know detail things around this topic. I'm happy if
> someone knows it.
>
> * Why dummy DAI doesn't/can't have channels_min ?
>
> * Why it checks CPU side channels_min only when DPCM ?
> I think it should check both CPU and Codec.
> I could understand if it checks FE:CPU and BE:Codec (it is assuming
> other side was dummy), but both (FE/BE) check CPU side only...
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-25 15:20 ` Pierre-Louis Bossart
@ 2024-04-25 21:59 ` Pierre-Louis Bossart
2024-04-26 0:24 ` Kuninori Morimoto
0 siblings, 1 reply; 39+ messages in thread
From: Pierre-Louis Bossart @ 2024-04-25 21:59 UTC (permalink / raw)
To: Kuninori Morimoto, Mark Brown; +Cc: alsa-devel, linux-sound
>> But because we have been used dpcm_xxx for 10 years since (B),
>> I understand to feel anxious to suddenly remove dpcm_xxx.
>
> Indeed we err on the side of paranoia with such changes!
>
>> I think it should be removed anyway, but want to have grace time ?
>> If so, the idea is that we can use it as "option flag" instead of
>> "mandatory flag" for a while, like below
>>
>> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
>> playback = (cpu_dai->driver->playback.channels_min > 0) ||
>> rtd->dai_link->dpcm_playback;
>> capture = (cpu_dai->driver->capture.channels_min > 0) ||
>> rtd->dai_link->dpcm_capture;
>>
>> * maybe we want to indicate message like "place re-check the flag and
>> remove it" via dev_info() if dpcm_xxx flag was used ?
>>
>> I think +2 kernel version or so is enough for grace time ?
>> After that, we can remove dpcm_xxx flag.
>
> I am good with that plan, but I'll need to investigate first why we had
> a failure with one of the Chromebooks on this v3 patchset. That may give
> us some insights on "special" uses of those flags.
I found the reason why this patchset failed on Intel CI: a dailink
direction is deemed supported only if ALL cpu- and codec-dais support it.
That is a stricter criterion than in existing code. This was a good
intention based on symmetry, but in practice there are exceptions to the
rule...
On some Chromebooks, we tag a dailink as supporting capture for echo
reference, but that echo reference is generated by the Intel firmware.
The amplifiers only support playback.
see https://github.com/thesofproject/linux/pull/4937 for details, I
added a clear log:
[ 807.304740] kernel: SSP1-Codec: CPU dai SSP1 Pin supports capture
but codec DAI rt1011-aif does not
So I think for now we probably want to avoid this stricter criterion and
only check the supported direction with the cpu-dais. Or we add an
escape mechanism to let the core know that the capture support was
intentional.
Also we relax the checks to go back to (E)
4f8721542f7b75954bfad98c51aa59d683d35b50
("ASoC: core: use less strict tests for dailink capabilities")
"
This patch modifies the snd_soc_dai_link_set_capabilities() helper so
that the dpcm_playback (resp. dpcm_capture) dailink capabilities are set
if at least one [cpu-]dai supports playback (resp. capture).
"
We tried checking all cpu-dais before and found issues, so "at least one
cpu dai" seems the strictest test to apply without breaking legacy.
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-25 21:59 ` Pierre-Louis Bossart
@ 2024-04-26 0:24 ` Kuninori Morimoto
2024-04-26 4:00 ` Kuninori Morimoto
0 siblings, 1 reply; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-26 0:24 UTC (permalink / raw)
To: Pierre-Louis Bossart; +Cc: Mark Brown, alsa-devel, linux-sound
Hi Pierre-Louis
Thank you for your feedback and report
> On some Chromebooks, we tag a dailink as supporting capture for echo
> reference, but that echo reference is generated by the Intel firmware.
> The amplifiers only support playback.
>
> see https://github.com/thesofproject/linux/pull/4937 for details, I
> added a clear log:
>
> [ 807.304740] kernel: SSP1-Codec: CPU dai SSP1 Pin supports capture
> but codec DAI rt1011-aif does not
>
> So I think for now we probably want to avoid this stricter criterion and
> only check the supported direction with the cpu-dais. Or we add an
> escape mechanism to let the core know that the capture support was
> intentional.
I think my patch have escape mechanism, but it was for BE Codec.
If my understand was correct, above is FE Codec ?
One question is that is it just a mistake (no one noticed) ? or is there
some reasons it can't support capture (but use it ?). If it was just a
mistake, is it possible to update driver during the grace time ?
Or do you think we need "escape mechanism" permanently ?
> I agree with your analysis. We don't have a clear memory/understanding
> of which "no_chan_DAI" platforms (B) was supposed to handle, and why no
> one reported them as broken by (C).
(snip)
> I am good with that plan, but I'll need to investigate first why we had
> a failure with one of the Chromebooks on this v3 patchset. That may give
> us some insights on "special" uses of those flags.
Thanks.
It seems the code was just complicated, and we have been missing
important check. Let's break out my patch-set into small pieces,
and go more slowly.
I think it will be like below. Can you agree about this ?
Step1
dpcm_xxx flag will be "option flag" instead of "mandatory flag"
for a while to keep compatibility and avoide confusion.
But it will be removed in Step3. To indicate such things,
it will have dev_warn() if dpcm_xxx flag was used. like below
if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
has_playback = /* at least one of CPU DAI supports playback */
has_capture = ...
if (!playback && rtd->dai_link->dpcm_playback) {
dev_warn(dev, "Playback is requested, but CPU doesn't support it\n")
has_playback = 1;
}
...
Step2 (In case of "escape mechanism" is not needed)
Current DPCM is checking CPU side only. Indicate warning until
Step4 if Codec is not match . warning only, not error for a while.
if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
...
if (has_playback && /* no Codec DAI supports playback */)
dev_warn(dev, "Playback is requested, but Codec doesn't support it\n")
...
Step3
Step1 deadline
remove dpcm_xxx flag
Step4
Step2 deadline
CPU / Codec mismatch will be error.
It will be "at least one of CPU/Codec pair supports playback/capture"
Step5
There is no big diff between DPCM / non-DPCM check.
Merge these, and clean-up code (soc_get_playback_capture())
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture()
2024-04-26 0:24 ` Kuninori Morimoto
@ 2024-04-26 4:00 ` Kuninori Morimoto
0 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-26 4:00 UTC (permalink / raw)
To: Pierre-Louis Bossart; +Cc: Mark Brown, alsa-devel, linux-sound
Hi
> Step1
> dpcm_xxx flag will be "option flag" instead of "mandatory flag"
> for a while to keep compatibility and avoide confusion.
> But it will be removed in Step3. To indicate such things,
> it will have dev_warn() if dpcm_xxx flag was used. like below
>
> if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {
> has_playback = /* at least one of CPU DAI supports playback */
> has_capture = ...
>
> if (!playback && rtd->dai_link->dpcm_playback) {
> dev_warn(dev, "Playback is requested, but CPU doesn't support it\n")
> has_playback = 1;
> }
> ...
I noticed that this Step is not needed, because all existing driver has
both dpcm_xxx and availability.
Instead, We want to have warning to indicate to use xxx_only flag if
dpcm_xxx was used as limit availability.
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 02/23] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture() Kuninori Morimoto
@ 2024-04-18 4:12 ` Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 03/23] ASoC: soc-dai: remove snd_soc_dai_link_set_capabilities() Kuninori Morimoto
` (21 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:12 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
Historically, ASoC doesn't have validation check for DPCM BE Codec,
but it should have. Current ASoC is ignoring it same as before,
but let's indicate the warning about that.
This warning and code should be removed and cleaned if all DPCM BE
Codec driver has necessary settings in the future.
One of the big user which doesn't have it is Intel.
Below is at least already known settings missing driver.
--- sound/soc/codecs/hda.c ---
static struct snd_soc_dai_driver card_binder_dai = {
.id = -1,
.name = "codec-probing-DAI",
+ .capture.channels_min = 1,
+ .playback.channels_min = 1,
};
--- sound/pci/hda/patch_hdmi.c ---
static int generic_hdmi_build_pcms(...)
{
...
for (...) {
...
+ pstr->channels_min = 1;
}
return 0;
}
Link: https://lore.kernel.org/r/ab3f0c0a-62fd-a468-b3cf-0e4b59bac6ae@linux.intel.com
Cc: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-pcm.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 412e7b7d97f5..a79ca115f4e7 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2797,7 +2797,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_dai_link_ch_map *ch_maps;
struct snd_soc_dai *cpu_dai;
struct snd_soc_dai *codec_dai;
- struct snd_soc_dai *dummy_dai = snd_soc_find_dai(&snd_soc_dummy_dlc);
int cpu_playback;
int cpu_capture;
int has_playback = 0;
@@ -2836,24 +2835,36 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
* soc.h :: [dai_link->ch_maps Image sample]
*/
for_each_rtd_ch_maps(rtd, i, ch_maps) {
- cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu);
- codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec);
+ int cpu_play_t, cpu_capture_t;
+ int codec_play_t, codec_capture_t;
+
+ cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu);
+ codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec);
+
+ cpu_play_t = snd_soc_dai_stream_valid(cpu_dai, cpu_playback);
+ codec_play_t = snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK);
+
+ cpu_capture_t = snd_soc_dai_stream_valid(cpu_dai, cpu_capture);
+ codec_capture_t = snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE);
/*
- * FIXME
+ * FIXME / CLEAN-UP-ME
*
* DPCM BE Codec has been no checked before.
* It should be checked, but it breaks compatibility.
* It ignores BE Codec here, so far.
*/
- if (dai_link->no_pcm)
- codec_dai = dummy_dai;
+ if ((dai_link->no_pcm) &&
+ (!codec_play_t && !codec_capture_t)) {
+ dev_warn_once(rtd->dev, "DCPM BE Codec has no stream settings (%s)\n",
+ codec_dai->name);
+ codec_play_t = 1;
+ codec_capture_t = 1;
+ }
- if (snd_soc_dai_stream_valid(cpu_dai, cpu_playback) &&
- snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK))
+ if (cpu_play_t && codec_play_t)
has_playback = 1;
- if (snd_soc_dai_stream_valid(cpu_dai, cpu_capture) &&
- snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE))
+ if (cpu_capture_t && codec_capture_t)
has_capture = 1;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 03/23] ASoC: soc-dai: remove snd_soc_dai_link_set_capabilities()
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture() Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 02/23] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings Kuninori Morimoto
@ 2024-04-18 4:12 ` Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 04/23] ASoC: amd: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (20 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:12 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
snd_soc_dai_link_set_capabilities() checks all CPU/Codec DAI (Y)(Z)
for Playback/Capture (X) and checks its validation (A), and setup
dpcm_playback/capture flags (a).
void snd_soc_dai_link_set_capabilities(...)
{
...
(X) for_each_pcm_streams(direction) {
...
(Y) for_each_link_cpus(dai_link, i, cpu) {
...
(A) if (... snd_soc_dai_stream_valid(...)) {
...
}
}
(Z) for_each_link_codecs(dai_link, i, codec) {
...
(A) if (... snd_soc_dai_stream_valid(...)) {
...
}
}
...
}
(a) dai_link->dpcm_playback = supported[...];
(a) dai_link->dpcm_capture = supported[...];
}
This validation check will be automatically done on new
soc_get_playback_capture(). snd_soc_dai_link_set_capabilities() is no
longer needed. Let's remove it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc-dai.h | 1 -
sound/soc/fsl/imx-card.c | 3 ---
sound/soc/generic/audio-graph-card.c | 2 --
sound/soc/generic/audio-graph-card2.c | 2 --
sound/soc/generic/simple-card.c | 2 --
sound/soc/meson/axg-card.c | 1 -
sound/soc/meson/gx-card.c | 1 -
sound/soc/qcom/common.c | 1 -
sound/soc/soc-dai.c | 38 ---------------------------
9 files changed, 51 deletions(-)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index adcd8719d343..69ba1a628eab 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -219,7 +219,6 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai);
int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
struct snd_soc_pcm_runtime *rtd, int num);
bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);
-void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link);
void snd_soc_dai_action(struct snd_soc_dai *dai,
int stream, int action);
static inline void snd_soc_dai_activate(struct snd_soc_dai *dai,
diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
index cb8723965f2f..9c7e24cebd7b 100644
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -650,9 +650,6 @@ static int imx_card_parse_of(struct imx_card_data *data)
link->ops = &imx_aif_ops;
}
- if (link->no_pcm || link->dynamic)
- snd_soc_dai_link_set_capabilities(link);
-
/* Get dai fmt */
ret = simple_util_parse_daifmt(dev, np, codec,
NULL, &link->dai_fmt);
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 83e3ba773fbd..714ce1f4a061 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -246,8 +246,6 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv,
graph_parse_convert(dev, ep, &dai_props->adata);
- snd_soc_dai_link_set_capabilities(dai_link);
-
ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name);
li->link++;
diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 62606e20be9a..0d2ac4c9ba3d 100644
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -925,8 +925,6 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv,
graph_parse_convert(ep, dai_props); /* at node of <dpcm> */
graph_parse_convert(rep, dai_props); /* at node of <CPU/Codec> */
- snd_soc_dai_link_set_capabilities(dai_link);
-
graph_link_init(priv, rport, li, is_cpu);
err:
of_node_put(ep);
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 9c79ff6a568f..5e66812ffadf 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -276,8 +276,6 @@ static int simple_dai_link_of_dpcm(struct simple_util_priv *priv,
simple_parse_convert(dev, np, &dai_props->adata);
- snd_soc_dai_link_set_capabilities(dai_link);
-
ret = simple_link_init(priv, node, codec, li, prefix, dai_name);
out_put_node:
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 3180aa4d3a15..48f14c28f79d 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -338,7 +338,6 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np,
dai_link->num_c2c_params = 1;
} else {
dai_link->no_pcm = 1;
- snd_soc_dai_link_set_capabilities(dai_link);
if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))
ret = axg_card_parse_tdm(card, np, index);
}
diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c
index f1539e542638..7edca3e49c8f 100644
--- a/sound/soc/meson/gx-card.c
+++ b/sound/soc/meson/gx-card.c
@@ -107,7 +107,6 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np,
dai_link->num_c2c_params = 1;
} else {
dai_link->no_pcm = 1;
- snd_soc_dai_link_set_capabilities(dai_link);
/* Check if the cpu is the i2s encoder and parse i2s data */
if (gx_card_cpu_identify(dai_link->cpus, "I2S Encoder"))
ret = gx_card_parse_i2s(card, np, index);
diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c
index 747041fa7866..24862002e82b 100644
--- a/sound/soc/qcom/common.c
+++ b/sound/soc/qcom/common.c
@@ -145,7 +145,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
if (platform || !codec) {
/* DPCM */
- snd_soc_dai_link_set_capabilities(link);
link->ignore_suspend = 1;
link->nonatomic = 1;
}
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index fefe394dce72..f8e46bec6f80 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -479,44 +479,6 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir)
return stream->channels_min;
}
-/*
- * snd_soc_dai_link_set_capabilities() - set dai_link properties based on its DAIs
- */
-void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link)
-{
- bool supported[SNDRV_PCM_STREAM_LAST + 1];
- int direction;
-
- for_each_pcm_streams(direction) {
- struct snd_soc_dai_link_component *cpu;
- struct snd_soc_dai_link_component *codec;
- struct snd_soc_dai *dai;
- bool supported_cpu = false;
- bool supported_codec = false;
- int i;
-
- for_each_link_cpus(dai_link, i, cpu) {
- dai = snd_soc_find_dai_with_mutex(cpu);
- if (dai && snd_soc_dai_stream_valid(dai, direction)) {
- supported_cpu = true;
- break;
- }
- }
- for_each_link_codecs(dai_link, i, codec) {
- dai = snd_soc_find_dai_with_mutex(codec);
- if (dai && snd_soc_dai_stream_valid(dai, direction)) {
- supported_codec = true;
- break;
- }
- }
- supported[direction] = supported_cpu && supported_codec;
- }
-
- dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK];
- dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE];
-}
-EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities);
-
void snd_soc_dai_action(struct snd_soc_dai *dai,
int stream, int action)
{
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 04/23] ASoC: amd: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (2 preceding siblings ...)
2024-04-18 4:12 ` [PATCH v3 03/23] ASoC: soc-dai: remove snd_soc_dai_link_set_capabilities() Kuninori Morimoto
@ 2024-04-18 4:12 ` Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 05/23] ASoC: fsl: " Kuninori Morimoto
` (19 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:12 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++--------
sound/soc/amd/acp-es8336.c | 4 ++--
sound/soc/amd/acp/acp-mach-common.c | 34 ++++++++++++++--------------
sound/soc/amd/acp3x-rt5682-max9836.c | 8 +++----
sound/soc/amd/vangogh/acp5x-mach.c | 12 +++++-----
5 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index 77cf72082e73..b7ff9c12634d 100644
--- 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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 e079b3218c6f..ccd355cf3703 100644
--- a/sound/soc/amd/acp-es8336.c
+++ b/sound/soc/amd/acp-es8336.c
@@ -150,8 +150,8 @@ 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,
+ .capture_assertion = 1,
+ .playback_assertion = 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 665a6ea0a2a8..23172b84eb34 100644
--- a/sound/soc/amd/acp/acp-mach-common.c
+++ b/sound/soc/amd/acp/acp-mach-common.c
@@ -1407,8 +1407,8 @@ 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].playback_assertion = 1;
+ links[i].capture_assertion = 1;
links[i].nonatomic = true;
links[i].no_pcm = 1;
if (!drv_data->hs_codec_id) {
@@ -1444,8 +1444,8 @@ 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].playback_assertion = 1;
+ links[i].capture_assertion = 1;
links[i].nonatomic = true;
links[i].no_pcm = 1;
if (!drv_data->hs_codec_id) {
@@ -1480,7 +1480,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_assertion = 1;
links[i].nonatomic = true;
links[i].no_pcm = 1;
if (!drv_data->amp_codec_id) {
@@ -1512,7 +1512,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_assertion = 1;
links[i].nonatomic = true;
links[i].no_pcm = 1;
if (!drv_data->amp_codec_id) {
@@ -1527,7 +1527,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].capture_assertion = 1;
links[i].codecs = max98388;
links[i].num_codecs = ARRAY_SIZE(max98388);
links[i].ops = &acp_max98388_ops;
@@ -1553,8 +1553,8 @@ 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].playback_assertion = 1;
+ links[i].capture_assertion = 1;
links[i].nonatomic = true;
links[i].no_pcm = 1;
if (!drv_data->bt_codec_id) {
@@ -1574,7 +1574,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_assertion = 1;
links[i].nonatomic = true;
links[i].no_pcm = 1;
}
@@ -1613,8 +1613,8 @@ 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;
+ links[i].playback_assertion = 1;
+ links[i].capture_assertion = 1;
if (!drv_data->hs_codec_id) {
/* Use dummy codec if codec id not specified */
links[i].codecs = &snd_soc_dummy_dlc;
@@ -1657,8 +1657,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].platforms = platform_component;
links[i].num_platforms = ARRAY_SIZE(platform_component);
}
- links[i].dpcm_playback = 1;
- links[i].dpcm_capture = 1;
+ links[i].playback_assertion = 1;
+ links[i].capture_assertion = 1;
if (!drv_data->hs_codec_id) {
/* Use dummy codec if codec id not specified */
links[i].codecs = &snd_soc_dummy_dlc;
@@ -1686,7 +1686,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_assertion = 1;
if (!drv_data->amp_codec_id) {
/* Use dummy codec if codec id not specified */
links[i].codecs = &snd_soc_dummy_dlc;
@@ -1724,7 +1724,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].platforms = platform_component;
links[i].num_platforms = ARRAY_SIZE(platform_component);
}
- links[i].dpcm_playback = 1;
+ links[i].playback_assertion = 1;
if (!drv_data->amp_codec_id) {
/* Use dummy codec if codec id not specified */
links[i].codecs = &snd_soc_dummy_dlc;
@@ -1774,7 +1774,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].num_platforms = ARRAY_SIZE(platform_component);
}
links[i].ops = &acp_card_dmic_ops;
- links[i].dpcm_capture = 1;
+ links[i].capture_assertion = 1;
}
card->dai_link = links;
diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c
index d6cdb6d9fdd6..dc329f611f34 100644
--- a/sound/soc/amd/acp3x-rt5682-max9836.c
+++ b/sound/soc/amd/acp3x-rt5682-max9836.c
@@ -317,8 +317,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &acp3x_5682_ops,
SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform),
},
@@ -327,7 +327,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_assertion = 1,
.ops = &acp3x_max_play_ops,
.cpus = acp3x_bt,
.num_cpus = ARRAY_SIZE(acp3x_bt),
@@ -339,7 +339,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_assertion = 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 7878e061ecb9..cd5b075d4b7e 100644
--- a/sound/soc/amd/vangogh/acp5x-mach.c
+++ b/sound/soc/amd/vangogh/acp5x-mach.c
@@ -276,8 +276,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &acp5x_8821_ops,
.init = acp5x_8821_init,
SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
@@ -288,7 +288,7 @@ 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_assertion = 1,
.playback_only = 1,
.ops = &acp5x_cs35l41_play_ops,
SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform),
@@ -375,8 +375,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &acp5x_8821_ops,
.init = acp5x_8821_init,
SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
@@ -387,7 +387,7 @@ 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_assertion = 1,
.playback_only = 1,
.ops = &acp5x_max98388_play_ops,
SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform),
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 05/23] ASoC: fsl: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (3 preceding siblings ...)
2024-04-18 4:12 ` [PATCH v3 04/23] ASoC: amd: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
@ 2024-04-18 4:13 ` Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 06/23] ASoC: sof: " Kuninori Morimoto
` (18 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:13 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/fsl/fsl-asoc-card.c | 20 ++++++++++----------
sound/soc/fsl/imx-audmix.c | 8 ++++----
sound/soc/fsl/imx-card.c | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index f6d2564864c6..50ca3e72eb21 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -320,8 +320,8 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = {
{
.name = "HiFi-ASRC-FE",
.stream_name = "HiFi-ASRC-FE",
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.dynamic = 1,
SND_SOC_DAILINK_REG(hifi_fe),
},
@@ -330,8 +330,8 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = {
.stream_name = "HiFi-ASRC-BE",
.be_hw_params_fixup = be_hw_params_fixup,
.ops = &fsl_asoc_card_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(hifi_be),
},
@@ -649,8 +649,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
} else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic31xx")) {
codec_dai_name = "tlv320dac31xx-hifi";
priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
- priv->dai_link[1].dpcm_capture = 0;
- priv->dai_link[2].dpcm_capture = 0;
+ priv->dai_link[1].capture_assertion = 0;
+ priv->dai_link[2].capture_assertion = 0;
priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_OUT;
priv->cpu_priv.sysclk_dir[RX] = SND_SOC_CLOCK_OUT;
priv->card.dapm_routes = audio_map_tx;
@@ -676,15 +676,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
priv->dai_fmt = SND_SOC_DAIFMT_LEFT_J |
SND_SOC_DAIFMT_CBC_CFC |
SND_SOC_DAIFMT_NB_NF;
- priv->dai_link[1].dpcm_capture = 0;
- priv->dai_link[2].dpcm_capture = 0;
+ priv->dai_link[1].capture_assertion = 0;
+ priv->dai_link[2].capture_assertion = 0;
priv->card.dapm_routes = audio_map_tx;
priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx);
} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8524")) {
codec_dai_name = "wm8524-hifi";
priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;
- priv->dai_link[1].dpcm_capture = 0;
- priv->dai_link[2].dpcm_capture = 0;
+ priv->dai_link[1].capture_assertion = 0;
+ priv->dai_link[2].capture_assertion = 0;
priv->cpu_priv.slot_width = 32;
priv->card.dapm_routes = audio_map_tx;
priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx);
diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c
index 2aeb18397bcb..ca768375e7c7 100644
--- a/sound/soc/fsl/imx-audmix.c
+++ b/sound/soc/fsl/imx-audmix.c
@@ -258,8 +258,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
priv->dai[i].cpus->of_node = args.np;
priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev);
priv->dai[i].dynamic = 1;
- priv->dai[i].dpcm_playback = 1;
- priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0);
+ priv->dai[i].playback_assertion = 1;
+ priv->dai[i].capture_assertion = (i == 0 ? 1 : 0);
priv->dai[i].ignore_pmdown_time = 1;
priv->dai[i].ops = &imx_audmix_fe_ops;
@@ -283,8 +283,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
priv->dai[num_dai + i].cpus->of_node = audmix_np;
priv->dai[num_dai + i].cpus->dai_name = be_name;
priv->dai[num_dai + i].no_pcm = 1;
- priv->dai[num_dai + i].dpcm_playback = 1;
- priv->dai[num_dai + i].dpcm_capture = 1;
+ priv->dai[num_dai + i].playback_assertion = 1;
+ priv->dai[num_dai + i].capture_assertion = 1;
priv->dai[num_dai + i].ignore_pmdown_time = 1;
priv->dai[num_dai + i].ops = &imx_audmix_be_ops;
diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
index 9c7e24cebd7b..873f6f89dcf5 100644
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -814,8 +814,8 @@ static int imx_card_probe(struct platform_device *pdev)
}
for_each_card_prelinks(&data->card, i, link) {
if (link->dynamic == 1 && link_be) {
- link->dpcm_playback = link_be->dpcm_playback;
- link->dpcm_capture = link_be->dpcm_capture;
+ link->playback_assertion = link_be->playback_assertion;
+ link->capture_assertion = link_be->capture_assertion;
}
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 06/23] ASoC: sof: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (4 preceding siblings ...)
2024-04-18 4:13 ` [PATCH v3 05/23] ASoC: fsl: " Kuninori Morimoto
@ 2024-04-18 4:13 ` Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 07/23] ASoC: meson: " Kuninori Morimoto
` (17 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:13 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sof/nocodec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c
index 34aa8a7cfc7d..0f0632456398 100644
--- a/sound/soc/sof/nocodec.c
+++ b/sound/soc/sof/nocodec.c
@@ -56,9 +56,9 @@ static int sof_nocodec_bes_setup(struct device *dev,
links[i].cpus->dai_name = drv[i].name;
links[i].platforms->name = dev_name(dev->parent);
if (drv[i].playback.channels_min)
- links[i].dpcm_playback = 1;
+ links[i].playback_assertion = 1;
if (drv[i].capture.channels_min)
- links[i].dpcm_capture = 1;
+ links[i].capture_assertion = 1;
links[i].be_hw_params_fixup = sof_pcm_dai_link_fixup;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 07/23] ASoC: meson: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (5 preceding siblings ...)
2024-04-18 4:13 ` [PATCH v3 06/23] ASoC: sof: " Kuninori Morimoto
@ 2024-04-18 4:13 ` Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 08/23] ASoC: Intel: " Kuninori Morimoto
` (16 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:13 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/meson/axg-card.c | 8 ++++----
sound/soc/meson/meson-card-utils.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 48f14c28f79d..55198cdc6daa 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -132,7 +132,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
lb->stream_name = lb->name;
lb->cpus->of_node = pad->cpus->of_node;
lb->cpus->dai_name = "TDM Loopback";
- lb->dpcm_capture = 1;
+ lb->capture_assertion = 1;
lb->no_pcm = 1;
lb->ops = &axg_card_tdm_be_ops;
lb->init = axg_card_tdm_dai_lb_init;
@@ -176,7 +176,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card,
/* Disable playback is the interface has no tx slots */
if (!tx)
- link->dpcm_playback = 0;
+ link->playback_assertion = 0;
for (i = 0, rx = 0; i < AXG_TDM_NUM_LANES; i++) {
snprintf(propname, 32, "dai-tdm-slot-rx-mask-%d", i);
@@ -186,7 +186,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card,
/* Disable capture is the interface has no rx slots */
if (!rx)
- link->dpcm_capture = 0;
+ link->capture_assertion = 0;
/* ... but the interface should at least have one of them */
if (!tx && !rx) {
@@ -275,7 +275,7 @@ static int axg_card_parse_tdm(struct snd_soc_card *card,
return ret;
/* Add loopback if the pad dai has playback */
- if (link->dpcm_playback) {
+ if (link->playback_assertion) {
ret = axg_card_add_tdm_loopback(card, index);
if (ret)
return ret;
diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c
index ed6c7e2f609c..ac417e673951 100644
--- a/sound/soc/meson/meson-card-utils.c
+++ b/sound/soc/meson/meson-card-utils.c
@@ -186,9 +186,9 @@ int meson_card_set_fe_link(struct snd_soc_card *card,
link->dpcm_merged_rate = 1;
if (is_playback)
- link->dpcm_playback = 1;
+ link->playback_assertion = 1;
else
- link->dpcm_capture = 1;
+ link->capture_assertion = 1;
return meson_card_set_link_name(card, link, node, "fe");
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 08/23] ASoC: Intel: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (6 preceding siblings ...)
2024-04-18 4:13 ` [PATCH v3 07/23] ASoC: meson: " Kuninori Morimoto
@ 2024-04-18 4:13 ` Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 09/23] ASoC: mediatek: " Kuninori Morimoto
` (15 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:13 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/intel/boards/bdw-rt5650.c | 8 +--
sound/soc/intel/boards/bdw-rt5677.c | 8 +--
sound/soc/intel/boards/bdw_rt286.c | 14 ++---
sound/soc/intel/boards/bxt_da7219_max98357a.c | 34 +++++------
sound/soc/intel/boards/bxt_rt298.c | 28 ++++-----
sound/soc/intel/boards/bytcht_cx2072x.c | 10 ++--
sound/soc/intel/boards/bytcht_da7213.c | 10 ++--
sound/soc/intel/boards/bytcht_es8316.c | 10 ++--
sound/soc/intel/boards/bytcht_nocodec.c | 10 ++--
sound/soc/intel/boards/bytcr_rt5640.c | 10 ++--
sound/soc/intel/boards/bytcr_rt5651.c | 10 ++--
sound/soc/intel/boards/bytcr_wm5102.c | 10 ++--
sound/soc/intel/boards/cht_bsw_max98090_ti.c | 10 ++--
sound/soc/intel/boards/cht_bsw_nau8824.c | 10 ++--
sound/soc/intel/boards/cht_bsw_rt5645.c | 10 ++--
sound/soc/intel/boards/cht_bsw_rt5672.c | 10 ++--
sound/soc/intel/boards/ehl_rt5660.c | 16 ++---
sound/soc/intel/boards/glk_rt5682_max98357a.c | 32 +++++-----
sound/soc/intel/boards/hsw_rt5640.c | 14 ++---
sound/soc/intel/boards/kbl_da7219_max98357a.c | 28 ++++-----
sound/soc/intel/boards/kbl_da7219_max98927.c | 60 +++++++++----------
sound/soc/intel/boards/kbl_rt5660.c | 20 +++----
sound/soc/intel/boards/kbl_rt5663_max98927.c | 48 +++++++--------
.../intel/boards/kbl_rt5663_rt5514_max98927.c | 26 ++++----
sound/soc/intel/boards/skl_hda_dsp_common.c | 18 +++---
.../soc/intel/boards/skl_nau88l25_max98357a.c | 28 ++++-----
sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 30 +++++-----
sound/soc/intel/boards/skl_rt286.c | 28 ++++-----
sound/soc/intel/boards/sof_board_helpers.c | 18 +++---
sound/soc/intel/boards/sof_es8336.c | 10 ++--
sound/soc/intel/boards/sof_pcm512x.c | 8 +--
sound/soc/intel/boards/sof_sdw.c | 4 +-
sound/soc/intel/boards/sof_wm8804.c | 4 +-
33 files changed, 297 insertions(+), 297 deletions(-)
diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c
index 3ae26f21458f..7f0544203c1f 100644
--- a/sound/soc/intel/boards/bdw-rt5650.c
+++ b/sound/soc/intel/boards/bdw-rt5650.c
@@ -239,8 +239,8 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST
},
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(fe, dummy, platform),
},
@@ -256,8 +256,8 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = broadwell_ssp0_fixup,
.ops = &bdw_rt5650_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.init = bdw_rt5650_init,
SND_SOC_DAILINK_REG(ssp0_port, be, platform),
},
diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c
index 304af3d06d01..54e3c5d3c251 100644
--- a/sound/soc/intel/boards/bdw-rt5677.c
+++ b/sound/soc/intel/boards/bdw-rt5677.c
@@ -329,8 +329,8 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST
},
- .dpcm_capture = 1,
- .dpcm_playback = 1,
+ .capture_assertion = 1,
+ .playback_assertion = 1,
.ops = &bdw_rt5677_fe_ops,
SND_SOC_DAILINK_REG(fe, dummy, platform),
},
@@ -356,8 +356,8 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = broadwell_ssp0_fixup,
.ops = &bdw_rt5677_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.init = bdw_rt5677_init,
.exit = bdw_rt5677_exit,
SND_SOC_DAILINK_REG(ssp0_port, be, platform),
diff --git a/sound/soc/intel/boards/bdw_rt286.c b/sound/soc/intel/boards/bdw_rt286.c
index 7f20159c23e5..ca2a19fa1c19 100644
--- a/sound/soc/intel/boards/bdw_rt286.c
+++ b/sound/soc/intel/boards/bdw_rt286.c
@@ -133,8 +133,8 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
{
@@ -143,7 +143,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(offload0, dummy, platform),
},
{
@@ -152,7 +152,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(offload1, dummy, platform),
},
{
@@ -161,7 +161,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(loopback, dummy, platform),
},
/* Back End DAI links */
@@ -177,8 +177,8 @@ static struct snd_soc_dai_link card_dai_links[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = codec_link_hw_params_fixup,
.ops = &codec_link_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
},
};
diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 3fe3f38c6cb6..0efa9d5f0fe1 100644
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -504,7 +504,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.init = broxton_da7219_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &broxton_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -516,7 +516,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &broxton_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -527,7 +527,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &broxton_da7219_fe_ops,
SND_SOC_DAILINK_REG(system2, dummy, platform),
},
@@ -536,7 +536,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.name = "Bxt Audio Reference cap",
.stream_name = "Refcap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &broxton_refcap_ops,
@@ -547,7 +547,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.name = "Bxt Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &broxton_dmic_ops,
@@ -557,7 +557,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
{
.name = "Bxt HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -567,7 +567,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
{
.name = "Bxt HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -577,7 +577,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
{
.name = "Bxt HDMI Port3",
.stream_name = "Hdmi3",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -594,7 +594,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = broxton_ssp_fixup,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
},
{
@@ -607,8 +607,8 @@ static struct snd_soc_dai_link broxton_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = broxton_ssp_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
@@ -616,7 +616,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.id = 2,
.ignore_suspend = 1,
.be_hw_params_fixup = broxton_dmic_fixup,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
@@ -624,7 +624,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.name = "iDisp1",
.id = 3,
.init = broxton_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
},
@@ -632,7 +632,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.name = "iDisp2",
.id = 4,
.init = broxton_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -640,7 +640,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.name = "iDisp3",
.id = 5,
.init = broxton_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
@@ -648,7 +648,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.name = "dmic16k",
.id = 6,
.be_hw_params_fixup = broxton_dmic_fixup,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform),
},
@@ -838,7 +838,7 @@ static int broxton_audio_probe(struct platform_device *pdev)
if (ctx->spkamp == SPKAMP_MAX98390) {
broxton_dais[i].codecs = max98390_codec;
broxton_dais[i].num_codecs = ARRAY_SIZE(max98390_codec);
- broxton_dais[i].dpcm_capture = 1;
+ broxton_dais[i].capture_assertion = 1;
}
}
/* DIALOG_CODEC is connected to SSP0 */
diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index afc499be8db2..af817dd6ad78 100644
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -394,7 +394,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.dynamic = 1,
.init = broxton_rt298_fe_init,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &broxton_rt286_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -405,7 +405,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &broxton_rt286_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -414,7 +414,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.name = "Bxt Audio Reference cap",
.stream_name = "refcap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
SND_SOC_DAILINK_REG(reference, dummy, platform),
@@ -424,7 +424,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.name = "Bxt Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &broxton_dmic_ops,
@@ -434,7 +434,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
{
.name = "Bxt HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -444,7 +444,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
{
.name = "Bxt HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -454,7 +454,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
{
.name = "Bxt HDMI Port3",
.stream_name = "Hdmi3",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -472,8 +472,8 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = broxton_ssp5_fixup,
.ops = &broxton_rt298_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
},
{
@@ -481,7 +481,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.id = 1,
.be_hw_params_fixup = broxton_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
@@ -490,7 +490,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.id = 2,
.be_hw_params_fixup = broxton_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
},
@@ -498,7 +498,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.name = "iDisp1",
.id = 3,
.init = broxton_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
},
@@ -506,7 +506,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.name = "iDisp2",
.id = 4,
.init = broxton_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -514,7 +514,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.name = "iDisp3",
.id = 5,
.init = broxton_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c
index c014d85a08b2..6f4158772ed6 100644
--- a/sound/soc/intel/boards/bytcht_cx2072x.c
+++ b/sound/soc/intel/boards/bytcht_cx2072x.c
@@ -175,8 +175,8 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &byt_cht_cx2072x_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -185,7 +185,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &byt_cht_cx2072x_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -198,8 +198,8 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
| SND_SOC_DAIFMT_CBC_CFC,
.init = byt_cht_cx2072x_init,
.be_hw_params_fixup = byt_cht_cx2072x_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp2, cx2072x, platform),
},
};
diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c
index f4ac3ddd148b..046b191f79e1 100644
--- a/sound/soc/intel/boards/bytcht_da7213.c
+++ b/sound/soc/intel/boards/bytcht_da7213.c
@@ -174,8 +174,8 @@ static struct snd_soc_dai_link dailink[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -184,7 +184,7 @@ static struct snd_soc_dai_link dailink[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -197,8 +197,8 @@ static struct snd_soc_dai_link dailink[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBC_CFC,
.be_hw_params_fixup = codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &ssp2_ops,
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index 2fcec2e02bb5..d6f65c1a30d9 100644
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -315,8 +315,8 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &byt_cht_es8316_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -326,7 +326,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &byt_cht_es8316_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -339,8 +339,8 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBC_CFC,
.be_hw_params_fixup = byt_cht_es8316_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.init = byt_cht_es8316_init,
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/bytcht_nocodec.c b/sound/soc/intel/boards/bytcht_nocodec.c
index 4a957d1cece3..d16468583b03 100644
--- a/sound/soc/intel/boards/bytcht_nocodec.c
+++ b/sound/soc/intel/boards/bytcht_nocodec.c
@@ -119,8 +119,8 @@ static struct snd_soc_dai_link dais[] = {
.ignore_suspend = 1,
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -130,7 +130,7 @@ static struct snd_soc_dai_link dais[] = {
.ignore_suspend = 1,
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -144,8 +144,8 @@ static struct snd_soc_dai_link dais[] = {
| SND_SOC_DAIFMT_CBC_CFC,
.be_hw_params_fixup = codec_fixup,
.ignore_suspend = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp2_port, dummy, platform),
},
};
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 05f38d1f7d82..a498375bb536 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1533,8 +1533,8 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
.stream_name = "Baytrail Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &byt_rt5640_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -1543,7 +1543,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &byt_rt5640_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -1555,8 +1555,8 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBC_CFC,
.be_hw_params_fixup = byt_rt5640_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.init = byt_rt5640_init,
.exit = byt_rt5640_exit,
.ops = &byt_rt5640_be_ssp2_ops,
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 80c841b000a3..dc1c0eb29277 100644
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -770,8 +770,8 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &byt_rt5651_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -780,7 +780,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &byt_rt5651_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -793,8 +793,8 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBC_CFC,
.be_hw_params_fixup = byt_rt5651_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.init = byt_rt5651_init,
.ops = &byt_rt5651_be_ssp2_ops,
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c
index cccb5e90c0fe..22d31008642a 100644
--- a/sound/soc/intel/boards/bytcr_wm5102.c
+++ b/sound/soc/intel/boards/bytcr_wm5102.c
@@ -462,8 +462,8 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
.stream_name = "Baytrail Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &byt_wm5102_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
@@ -473,7 +473,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &byt_wm5102_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -490,8 +490,8 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBC_CFC,
.be_hw_params_fixup = byt_wm5102_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.init = byt_wm5102_init,
SND_SOC_DAILINK_REG(ssp0_port, ssp0_codec, platform),
},
diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
index f43bc20d6aae..cb9b0c19192c 100644
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
@@ -351,8 +351,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -361,7 +361,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -374,8 +374,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
| SND_SOC_DAIFMT_CBC_CFC,
.init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_be_ssp2_ops,
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c
index 7651b83632fa..b6c2851afd29 100644
--- a/sound/soc/intel/boards/cht_bsw_nau8824.c
+++ b/sound/soc/intel/boards/cht_bsw_nau8824.c
@@ -193,8 +193,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -203,7 +203,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -217,8 +217,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
| SND_SOC_DAIFMT_CBC_CFC,
.init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_be_ssp2_ops,
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index eb41b7115d01..d6af19e77d6f 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -448,8 +448,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -458,7 +458,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -470,8 +470,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
.no_pcm = 1,
.init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_be_ssp2_ops,
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index be2d1a8dbca8..fd2430405f10 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -358,8 +358,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(media, dummy, platform),
},
@@ -368,7 +368,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
.stream_name = "Deep-Buffer Audio",
.nonatomic = true,
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &cht_aif1_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -381,8 +381,8 @@ static struct snd_soc_dai_link cht_dailink[] = {
.no_pcm = 1,
.init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &cht_be_ssp2_ops,
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/ehl_rt5660.c b/sound/soc/intel/boards/ehl_rt5660.c
index 686e60321224..651c7cc26f20 100644
--- a/sound/soc/intel/boards/ehl_rt5660.c
+++ b/sound/soc/intel/boards/ehl_rt5660.c
@@ -178,8 +178,8 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.name = "SSP0-Codec",
.id = 0,
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &rt5660_ops,
SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform),
},
@@ -187,7 +187,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.name = "dmic48k",
.id = 1,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
@@ -195,7 +195,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.name = "dmic16k",
.id = 2,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
},
@@ -203,7 +203,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.name = "iDisp1",
.id = 5,
.init = hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
},
@@ -211,7 +211,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.name = "iDisp2",
.id = 6,
.init = hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -219,7 +219,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.name = "iDisp3",
.id = 7,
.init = hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
@@ -227,7 +227,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.name = "iDisp4",
.id = 8,
.init = hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform),
},
diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c
index 4098b2d32f9b..b5b01fee719a 100644
--- a/sound/soc/intel/boards/glk_rt5682_max98357a.c
+++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c
@@ -413,7 +413,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.init = geminilake_rt5682_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
[GLK_DPCM_AUDIO_CP] = {
@@ -423,13 +423,13 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
[GLK_DPCM_AUDIO_HS_PB] = {
.name = "Glk Audio Headset Playback",
.stream_name = "Headset Audio",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
SND_SOC_DAILINK_REG(system2, dummy, platform),
@@ -438,7 +438,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.name = "Glk Audio Echo Reference cap",
.stream_name = "Echoreference Capture",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
SND_SOC_DAILINK_REG(echoref, dummy, platform),
@@ -447,7 +447,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.name = "Glk Audio Reference cap",
.stream_name = "Refcap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &geminilake_refcap_ops,
@@ -457,7 +457,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.name = "Glk Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &geminilake_dmic_ops,
@@ -466,7 +466,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
[GLK_DPCM_AUDIO_HDMI1_PB] = {
.name = "Glk HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -477,7 +477,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
[GLK_DPCM_AUDIO_HDMI2_PB] = {
.name = "Glk HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -490,7 +490,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -507,7 +507,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = geminilake_ssp_fixup,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
@@ -521,8 +521,8 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = geminilake_ssp_fixup,
.ops = &geminilake_rt5682_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp2_pin, ssp2_codec_5682, platform),
},
{
@@ -530,7 +530,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.id = 2,
.ignore_suspend = 1,
.be_hw_params_fixup = geminilake_dmic_fixup,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
@@ -538,7 +538,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.name = "iDisp1",
.id = 3,
.init = geminilake_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
},
@@ -546,7 +546,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.name = "iDisp2",
.id = 4,
.init = geminilake_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -554,7 +554,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.name = "iDisp3",
.id = 5,
.init = geminilake_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/hsw_rt5640.c b/sound/soc/intel/boards/hsw_rt5640.c
index 2a2fe27dff0e..930c09205516 100644
--- a/sound/soc/intel/boards/hsw_rt5640.c
+++ b/sound/soc/intel/boards/hsw_rt5640.c
@@ -85,8 +85,8 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
{
@@ -95,7 +95,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(offload0, dummy, platform),
},
{
@@ -104,7 +104,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(offload1, dummy, platform),
},
{
@@ -113,7 +113,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(loopback, dummy, platform),
},
/* Back End DAI links */
@@ -127,8 +127,8 @@ static struct snd_soc_dai_link card_dai_links[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = codec_link_hw_params_fixup,
.ops = &codec_link_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
},
};
diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
index 9dbc15f9d1c9..ac5abde7f6fa 100644
--- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
+++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
@@ -460,7 +460,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.init = kabylake_da7219_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -471,7 +471,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -479,7 +479,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio Reference cap",
.stream_name = "Wake on Voice",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_refcap_ops,
@@ -489,7 +489,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &kabylake_dmic_ops,
@@ -498,7 +498,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Kbl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -509,7 +509,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Kbl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -522,7 +522,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -540,7 +540,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
},
{
@@ -553,8 +553,8 @@ static struct snd_soc_dai_link kabylake_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
@@ -562,14 +562,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.id = 2,
.be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
{
.name = "iDisp1",
.id = 3,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = kabylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -578,7 +578,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "iDisp2",
.id = 4,
.init = kabylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -586,7 +586,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "iDisp3",
.id = 5,
.init = kabylake_hdmi3_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c
index e662da5af83b..42c4ad52d181 100644
--- a/sound/soc/intel/boards/kbl_da7219_max98927.c
+++ b/sound/soc/intel/boards/kbl_da7219_max98927.c
@@ -686,7 +686,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.init = kabylake_da7219_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -694,7 +694,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
SND_SOC_DAILINK_REG(echoref, dummy, platform),
},
@@ -702,7 +702,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio Reference cap",
.stream_name = "Wake on Voice",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_refcap_ops,
@@ -712,7 +712,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &kabylake_dmic_ops,
@@ -721,7 +721,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Kbl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -732,7 +732,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Kbl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -745,7 +745,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -754,7 +754,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HS_PB] = {
.name = "Kbl Audio Headset Playback",
.stream_name = "Headset Audio",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.init = kabylake_da7219_fe_init,
@@ -770,7 +770,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -784,8 +784,8 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBC_CFC,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_ssp0_ops,
@@ -801,8 +801,8 @@ static struct snd_soc_dai_link kabylake_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
@@ -811,14 +811,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.init = kabylake_dmic_init,
.be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
{
.name = "iDisp1",
.id = 3,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = kabylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -827,7 +827,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "iDisp2",
.id = 4,
.init = kabylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -835,7 +835,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "iDisp3",
.id = 5,
.init = kabylake_hdmi3_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
@@ -852,7 +852,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.init = kabylake_da7219_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -860,7 +860,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
SND_SOC_DAILINK_REG(echoref, dummy, platform),
},
@@ -868,7 +868,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.name = "Kbl Audio Reference cap",
.stream_name = "Wake on Voice",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_refcap_ops,
@@ -878,7 +878,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.name = "Kbl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &kabylake_dmic_ops,
@@ -887,7 +887,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
[KBL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Kbl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -898,7 +898,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
[KBL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Kbl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -911,7 +911,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -927,8 +927,8 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBC_CFC,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_ssp0_ops,
@@ -940,14 +940,14 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.init = kabylake_dmic_init,
.be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
{
.name = "iDisp1",
.id = 2,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = kabylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -956,7 +956,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.name = "iDisp2",
.id = 3,
.init = kabylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -964,7 +964,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.name = "iDisp3",
.id = 4,
.init = kabylake_hdmi3_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c
index 894d127c482a..ae1259c0fc2c 100644
--- a/sound/soc/intel/boards/kbl_rt5660.c
+++ b/sound/soc/intel/boards/kbl_rt5660.c
@@ -377,7 +377,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_rt5660_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -388,14 +388,14 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &kabylake_rt5660_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
[KBL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Kbl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -406,7 +406,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
[KBL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Kbl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -419,7 +419,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -440,14 +440,14 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp0_fixup,
.ops = &kabylake_rt5660_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
},
{
.name = "iDisp1",
.id = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = kabylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -456,7 +456,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.name = "iDisp2",
.id = 2,
.init = kabylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -464,7 +464,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.name = "iDisp3",
.id = 3,
.init = kabylake_hdmi3_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
index 646e8ff8e961..b59773d61127 100644
--- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -687,7 +687,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.init = kabylake_rt5663_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_rt5663_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -698,14 +698,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &kabylake_rt5663_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
[KBL_DPCM_AUDIO_HS_PB] = {
.name = "Kbl Audio Headset Playback",
.stream_name = "Headset Audio",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
SND_SOC_DAILINK_REG(system2, dummy, platform),
@@ -714,7 +714,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
SND_SOC_DAILINK_REG(echoref, dummy, platform),
},
@@ -722,7 +722,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio Reference cap",
.stream_name = "Wake on Voice",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_refcap_ops,
@@ -732,7 +732,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &kabylake_dmic_ops,
@@ -741,7 +741,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Kbl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -752,7 +752,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Kbl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -765,7 +765,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -783,7 +783,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_ssp0_ops,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
},
@@ -798,8 +798,8 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_rt5663_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
@@ -807,14 +807,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.id = 2,
.be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform),
},
{
.name = "iDisp1",
.id = 3,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = kabylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -823,7 +823,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "iDisp2",
.id = 4,
.init = kabylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -831,7 +831,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "iDisp3",
.id = 5,
.init = kabylake_hdmi3_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
@@ -846,7 +846,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_rt5663_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -857,14 +857,14 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &kabylake_rt5663_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
[KBL_DPCM_AUDIO_5663_HDMI1_PB] = {
.name = "Kbl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -875,7 +875,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = {
[KBL_DPCM_AUDIO_5663_HDMI2_PB] = {
.name = "Kbl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -896,14 +896,14 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_rt5663_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
.name = "iDisp1",
.id = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = kabylake_5663_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -912,7 +912,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = {
.name = "iDisp2",
.id = 2,
.init = kabylake_5663_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 924d5d1de03a..2721dfe9a579 100644
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -575,7 +575,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.init = kabylake_rt5663_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &kabylake_rt5663_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -586,14 +586,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &kabylake_rt5663_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
[KBL_DPCM_AUDIO_HS_PB] = {
.name = "Kbl Audio Headset Playback",
.stream_name = "Headset Audio",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
SND_SOC_DAILINK_REG(system2, dummy, platform),
@@ -602,7 +602,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
SND_SOC_DAILINK_REG(echoref, dummy, platform),
},
@@ -615,7 +615,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "Kbl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &kabylake_dmic_ops,
@@ -624,7 +624,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Kbl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -635,7 +635,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
[KBL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Kbl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -655,8 +655,8 @@ static struct snd_soc_dai_link kabylake_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &kabylake_ssp0_ops,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
},
@@ -670,14 +670,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_rt5663_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
.name = "iDisp1",
.id = 3,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = kabylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -686,7 +686,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.name = "iDisp2",
.id = 4,
.init = kabylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c
index e9cefa4ae56d..7fa21bd51ecb 100644
--- a/sound/soc/intel/boards/skl_hda_dsp_common.c
+++ b/sound/soc/intel/boards/skl_hda_dsp_common.c
@@ -84,51 +84,51 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = {
{
.name = "iDisp1",
.id = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_cpu, idisp1_codec, platform),
},
{
.name = "iDisp2",
.id = 2,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_cpu, idisp2_codec, platform),
},
{
.name = "iDisp3",
.id = 3,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_cpu, idisp3_codec, platform),
},
{
.name = "Analog Playback and Capture",
.id = 4,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(analog_cpu, analog_codec, platform),
},
{
.name = "Digital Playback and Capture",
.id = 5,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(digital_cpu, digital_codec, platform),
},
{
.name = "dmic01",
.id = 6,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
{
.name = "dmic16k",
.id = 7,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
},
diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
index e4630c33176e..a6dcc7a5312b 100644
--- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
+++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
@@ -474,7 +474,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.init = skylake_nau8825_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &skylake_nau8825_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -485,7 +485,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &skylake_nau8825_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -493,7 +493,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "Skl Audio Reference cap",
.stream_name = "Wake on Voice",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_refcap_ops,
@@ -503,7 +503,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "Skl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_dmic_ops,
@@ -512,7 +512,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
[SKL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Skl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -523,7 +523,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
[SKL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Skl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -536,7 +536,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -554,7 +554,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
},
{
@@ -568,8 +568,8 @@ static struct snd_soc_dai_link skylake_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup,
.ops = &skylake_nau8825_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
@@ -577,14 +577,14 @@ static struct snd_soc_dai_link skylake_dais[] = {
.id = 2,
.be_hw_params_fixup = skylake_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
},
{
.name = "iDisp1",
.id = 3,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = skylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -593,7 +593,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "iDisp2",
.id = 4,
.init = skylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -601,7 +601,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "iDisp3",
.id = 5,
.init = skylake_hdmi3_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
index fadc25a536b4..6a6aaf1cef11 100644
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
@@ -513,7 +513,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.init = skylake_nau8825_fe_init,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &skylake_nau8825_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -524,7 +524,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &skylake_nau8825_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -532,7 +532,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "Skl Audio Reference cap",
.stream_name = "Wake on Voice",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_refcap_ops,
@@ -542,7 +542,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "Skl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_dmic_ops,
@@ -551,7 +551,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
[SKL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Skl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -562,7 +562,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
[SKL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Skl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -575,7 +575,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.stream_name = "Hdmi3",
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -594,8 +594,8 @@ static struct snd_soc_dai_link skylake_dais[] = {
.init = skylake_ssm4567_codec_init,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
},
{
@@ -609,8 +609,8 @@ static struct snd_soc_dai_link skylake_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup,
.ops = &skylake_nau8825_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
},
{
@@ -618,14 +618,14 @@ static struct snd_soc_dai_link skylake_dais[] = {
.id = 2,
.ignore_suspend = 1,
.be_hw_params_fixup = skylake_dmic_fixup,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform),
},
{
.name = "iDisp1",
.id = 3,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = skylake_hdmi1_init,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -634,7 +634,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "iDisp2",
.id = 4,
.init = skylake_hdmi2_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -642,7 +642,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.name = "iDisp3",
.id = 5,
.init = skylake_hdmi3_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
index 9a8044274908..bf20a1188b35 100644
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -348,7 +348,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST
},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &skylake_rt286_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -361,7 +361,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST
},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &skylake_rt286_fe_ops,
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
},
@@ -374,7 +374,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST
},
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &skylake_rt286_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
},
@@ -382,7 +382,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.name = "Skl Audio Reference cap",
.stream_name = "refcap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
SND_SOC_DAILINK_REG(reference, dummy, platform),
@@ -391,7 +391,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.name = "Skl Audio DMIC cap",
.stream_name = "dmiccap",
.init = NULL,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.dynamic = 1,
.ops = &skylake_dmic_ops,
@@ -400,7 +400,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
[SKL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Skl HDMI Port1",
.stream_name = "Hdmi1",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -409,7 +409,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
[SKL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Skl HDMI Port2",
.stream_name = "Hdmi2",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -418,7 +418,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
[SKL_DPCM_AUDIO_HDMI3_PB] = {
.name = "Skl HDMI Port3",
.stream_name = "Hdmi3",
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.init = NULL,
.nonatomic = 1,
.dynamic = 1,
@@ -438,8 +438,8 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp0_fixup,
.ops = &skylake_rt286_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
},
{
@@ -447,7 +447,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.id = 1,
.be_hw_params_fixup = skylake_dmic_fixup,
.ignore_suspend = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform),
},
@@ -455,7 +455,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.name = "iDisp1",
.id = 2,
.init = skylake_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
},
@@ -463,7 +463,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.name = "iDisp2",
.id = 3,
.init = skylake_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
},
@@ -471,7 +471,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.name = "iDisp3",
.id = 4,
.init = skylake_hdmi_init,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
},
diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c
index eb140e13153f..8cc7ca21cc57 100644
--- a/sound/soc/intel/boards/sof_board_helpers.c
+++ b/sound/soc/intel/boards/sof_board_helpers.c
@@ -144,8 +144,8 @@ static int set_ssp_codec_link(struct device *dev, struct snd_soc_dai_link *link,
link->id = be_id;
link->no_pcm = 1;
- link->dpcm_capture = 1;
- link->dpcm_playback = 1;
+ link->capture_assertion = 1;
+ link->playback_assertion = 1;
return 0;
}
@@ -195,7 +195,7 @@ static int set_dmic_link(struct device *dev, struct snd_soc_dai_link *link,
link->init = dmic_init;
link->ignore_suspend = 1;
link->no_pcm = 1;
- link->dpcm_capture = 1;
+ link->capture_assertion = 1;
return 0;
}
@@ -253,7 +253,7 @@ static int set_idisp_hdmi_link(struct device *dev, struct snd_soc_dai_link *link
link->id = be_id;
link->init = (hdmi_id == 1) ? hdmi_init : NULL;
link->no_pcm = 1;
- link->dpcm_playback = 1;
+ link->playback_assertion = 1;
return 0;
}
@@ -293,8 +293,8 @@ static int set_ssp_amp_link(struct device *dev, struct snd_soc_dai_link *link,
link->id = be_id;
link->no_pcm = 1;
- link->dpcm_capture = 1; /* feedback stream or firmware-generated echo reference */
- link->dpcm_playback = 1;
+ link->capture_assertion = 1; /* feedback stream or firmware-generated echo reference */
+ link->playback_assertion = 1;
return 0;
}
@@ -334,8 +334,8 @@ static int set_bt_offload_link(struct device *dev, struct snd_soc_dai_link *link
link->id = be_id;
link->no_pcm = 1;
- link->dpcm_capture = 1;
- link->dpcm_playback = 1;
+ link->capture_assertion = 1;
+ link->playback_assertion = 1;
return 0;
}
@@ -375,7 +375,7 @@ static int set_hdmi_in_link(struct device *dev, struct snd_soc_dai_link *link,
link->id = be_id;
link->no_pcm = 1;
- link->dpcm_capture = 1;
+ link->capture_assertion = 1;
return 0;
}
diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
index c1fcc156a575..f713de8721e5 100644
--- a/sound/soc/intel/boards/sof_es8336.c
+++ b/sound/soc/intel/boards/sof_es8336.c
@@ -455,8 +455,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].exit = sof_es8316_exit;
links[id].ops = &sof_es8336_ops;
links[id].nonatomic = true;
- links[id].dpcm_playback = 1;
- links[id].dpcm_capture = 1;
+ links[id].playback_assertion = 1;
+ links[id].capture_assertion = 1;
links[id].no_pcm = 1;
links[id].cpus = &cpus[id];
links[id].num_cpus = 1;
@@ -496,7 +496,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].platforms = platform_component;
links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].ignore_suspend = 1;
- links[id].dpcm_capture = 1;
+ links[id].capture_assertion = 1;
links[id].no_pcm = 1;
id++;
@@ -539,7 +539,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].platforms = platform_component;
links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].init = sof_hdmi_init;
- links[id].dpcm_playback = 1;
+ links[id].playback_assertion = 1;
links[id].no_pcm = 1;
id++;
@@ -569,7 +569,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].num_codecs = 1;
links[id].platforms = platform_component;
links[id].num_platforms = ARRAY_SIZE(platform_component);
- links[id].dpcm_capture = 1;
+ links[id].capture_assertion = 1;
links[id].no_pcm = 1;
links[id].num_cpus = 1;
id++;
diff --git a/sound/soc/intel/boards/sof_pcm512x.c b/sound/soc/intel/boards/sof_pcm512x.c
index b01cb2329542..b581fbcd9b86 100644
--- a/sound/soc/intel/boards/sof_pcm512x.c
+++ b/sound/soc/intel/boards/sof_pcm512x.c
@@ -246,12 +246,12 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].init = sof_pcm512x_codec_init;
links[id].ops = &sof_pcm512x_ops;
- links[id].dpcm_playback = 1;
+ links[id].playback_assertion = 1;
/*
* capture only supported with specific versions of the Hifiberry DAC+
*/
if (sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE)
- links[id].dpcm_capture = 1;
+ links[id].capture_assertion = 1;
links[id].no_pcm = 1;
links[id].cpus = &cpus[id];
links[id].num_cpus = 1;
@@ -294,7 +294,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].platforms = platform_component;
links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].ignore_suspend = 1;
- links[id].dpcm_capture = 1;
+ links[id].capture_assertion = 1;
links[id].no_pcm = 1;
id++;
}
@@ -341,7 +341,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].platforms = platform_component;
links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].init = sof_hdmi_init;
- links[id].dpcm_playback = 1;
+ links[id].playback_assertion = 1;
links[id].no_pcm = 1;
id++;
}
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index d65c5da49000..2bbffbe06156 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -1152,8 +1152,8 @@ static void init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links
dai_links->num_cpus = cpus_num;
dai_links->codecs = codecs;
dai_links->num_codecs = codecs_num;
- dai_links->dpcm_playback = playback;
- dai_links->dpcm_capture = capture;
+ dai_links->playback_assertion = playback;
+ dai_links->capture_assertion = capture;
dai_links->init = init;
dai_links->ops = ops;
}
diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c
index 4cb0d463bf40..d276690b85f9 100644
--- a/sound/soc/intel/boards/sof_wm8804.c
+++ b/sound/soc/intel/boards/sof_wm8804.c
@@ -167,8 +167,8 @@ static struct snd_soc_dai_link dailink[] = {
.name = "SSP5-Codec",
.id = 0,
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ops = &sof_wm8804_ops,
SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
},
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 09/23] ASoC: mediatek: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (7 preceding siblings ...)
2024-04-18 4:13 ` [PATCH v3 08/23] ASoC: Intel: " Kuninori Morimoto
@ 2024-04-18 4:13 ` Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 10/23] ASoC: soc-core: " Kuninori Morimoto
` (14 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:13 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/mediatek/mt2701/mt2701-cs42448.c | 30 ++---
sound/soc/mediatek/mt2701/mt2701-wm8960.c | 8 +-
sound/soc/mediatek/mt6797/mt6797-mt6351.c | 34 +++---
sound/soc/mediatek/mt7986/mt7986-wm8960.c | 8 +-
sound/soc/mediatek/mt8173/mt8173-max98090.c | 8 +-
.../mediatek/mt8173/mt8173-rt5650-rt5514.c | 8 +-
.../mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +-
sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +-
.../mediatek/mt8183/mt8183-da7219-max98357.c | 40 +++----
.../mt8183/mt8183-mt6358-ts3a227-max98357.c | 40 +++----
sound/soc/mediatek/mt8186/mt8186-mt6366.c | 108 +++++++++---------
sound/soc/mediatek/mt8188/mt8188-mt6359.c | 60 +++++-----
.../mt8192/mt8192-mt6359-rt1015-rt5682.c | 86 +++++++-------
sound/soc/mediatek/mt8195/mt8195-mt6359.c | 62 +++++-----
sound/soc/samsung/odroid.c | 10 +-
15 files changed, 263 insertions(+), 263 deletions(-)
diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c
index 1262e8a1bc9a..b447c7d6b85b 100644
--- 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(fe_bt_in),
},
/* BE */
@@ -269,8 +269,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(be_i2s0),
},
[DAI_LINK_BE_I2S1] = {
@@ -279,8 +279,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(be_i2s1),
},
[DAI_LINK_BE_I2S2] = {
@@ -289,8 +289,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(be_i2s2),
},
[DAI_LINK_BE_I2S3] = {
@@ -299,15 +299,15 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 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,
+ .playback_assertion = 1,
+ .capture_assertion = 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 8a6643bfe830..c7863f11aa1b 100644
--- 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture),
},
/* BE */
@@ -86,8 +86,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 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 784c201b8fd4..eb22796e144f 100644
--- 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture_mono_1),
},
{
@@ -141,8 +141,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_lpbk),
},
@@ -152,8 +152,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_speech),
},
@@ -161,24 +161,24 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
{
.name = "Primary Codec",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(primary_codec),
},
{
.name = "PCM 1",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm1),
},
{
.name = "PCM 2",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 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 6982e833421d..14a98351ed0c 100644
--- 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture),
},
/* BE */
@@ -65,8 +65,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 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 0557a287c641..8da014cbdf98 100644
--- 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture),
},
/* Back End DAI links */
@@ -123,8 +123,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 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 4ed06c269065..4abaa13b39a1 100644
--- 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture),
},
/* Back End DAI links */
@@ -159,8 +159,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 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 763067c21153..747d9d10bd9c 100644
--- 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(hdmi_pcm),
},
@@ -200,14 +200,14 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(codec),
},
[DAI_LINK_HDMI_I2S] = {
.name = "HDMI BE",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 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 466f176f8e94..5b185420e0aa 100644
--- 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(hdmi_pcm),
},
/* Back End DAI links */
@@ -238,14 +238,14 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(codec),
},
[DAI_LINK_HDMI_I2S] = {
.name = "HDMI BE",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 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 acaf81fd6c9b..f928dec23bad 100644
--- 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture_mono),
},
{
@@ -492,38 +492,38 @@ 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_assertion = 1,
SND_SOC_DAILINK_REG(playback_hdmi),
},
/* BE */
{
.name = "Primary Codec",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(primary_codec),
},
{
.name = "PCM 1",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm1),
},
{
.name = "PCM 2",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm2),
},
{
.name = "I2S0",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
.ops = &mt8183_mt6358_i2s_ops,
@@ -532,7 +532,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
{
.name = "I2S1",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
.ops = &mt8183_mt6358_i2s_ops,
@@ -541,7 +541,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
{
.name = "I2S2",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
.ops = &mt8183_da7219_i2s_ops,
@@ -551,13 +551,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
{
.name = "I2S3",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
},
{
.name = "I2S5",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
.ops = &mt8183_mt6358_i2s_ops,
@@ -570,7 +570,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_assertion = 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 bb6df056a878..bcfc88551fb2 100644
--- 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(playback_hdmi),
},
{
@@ -513,31 +513,31 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
{
.name = "Primary Codec",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(primary_codec),
},
{
.name = "PCM 1",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm1),
},
{
.name = "PCM 2",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm2),
},
{
.name = "I2S0",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.ops = &mt8183_mt6358_i2s_ops,
SND_SOC_DAILINK_REG(i2s0),
@@ -545,7 +545,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
{
.name = "I2S1",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
.ops = &mt8183_mt6358_i2s_ops,
@@ -554,7 +554,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
{
.name = "I2S2",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
.ops = &mt8183_mt6358_i2s_ops,
@@ -564,13 +564,13 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
{
.name = "I2S3",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
},
{
.name = "I2S5",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.ops = &mt8183_mt6358_i2s_ops,
.init = &mt8183_bt_init,
@@ -582,7 +582,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_assertion = 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 8fd31c52b077..938d440bc187 100644
--- 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture7),
},
{
@@ -813,8 +813,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_lpbk),
},
@@ -824,8 +824,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_fm),
},
@@ -835,8 +835,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_src1),
},
@@ -846,8 +846,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_src_bargein),
},
@@ -857,7 +857,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_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_hw_gain_aaudio),
},
@@ -867,8 +867,8 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_src_aaudio),
},
@@ -876,8 +876,8 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
{
.name = "Primary Codec",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.init = primary_codec_init,
SND_SOC_DAILINK_REG(adda),
@@ -888,7 +888,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_assertion = 1,
.ignore_suspend = 1,
.init = mt8186_mt6366_rt1019_rt5682s_hdmi_init,
SND_SOC_DAILINK_REG(i2s3),
@@ -896,7 +896,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
{
.name = "I2S0",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.ops = &mt8186_rt5682s_i2s_ops,
SND_SOC_DAILINK_REG(i2s0),
@@ -904,7 +904,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
{
.name = "I2S1",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.init = mt8186_headset_codec_init,
SND_SOC_DAILINK_REG(i2s1),
@@ -912,46 +912,46 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
{
.name = "I2S2",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(i2s2),
},
{
.name = "HW Gain 1",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hw_gain1),
},
{
.name = "HW Gain 2",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hw_gain2),
},
{
.name = "HW_SRC_1",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hw_src1),
},
{
.name = "HW_SRC_2",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hw_src2),
},
{
.name = "CONNSYS_I2S",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(connsys_i2s),
},
@@ -960,15 +960,15 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm1),
},
{
.name = "TDM IN",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(tdm_in),
},
@@ -976,35 +976,35 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
{
.name = "Hostless_UL1",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_ul1),
},
{
.name = "Hostless_UL2",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_ul2),
},
{
.name = "Hostless_UL3",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_ul3),
},
{
.name = "Hostless_UL5",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_ul5),
},
{
.name = "Hostless_UL6",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(hostless_ul6),
},
@@ -1012,25 +1012,25 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
{
.name = "AFE_SOF_DL1",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(AFE_SOF_DL1),
},
{
.name = "AFE_SOF_DL2",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(AFE_SOF_DL2),
},
{
.name = "AFE_SOF_UL1",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(AFE_SOF_UL1),
},
{
.name = "AFE_SOF_UL2",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 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 f629fc6bbb53..6fe3c04ebdf7 100644
--- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
+++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
@@ -923,7 +923,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.dpcm_merged_chan = 1,
.dpcm_merged_rate = 1,
.dpcm_merged_format = 1,
@@ -937,7 +937,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.dpcm_merged_chan = 1,
.dpcm_merged_rate = 1,
.dpcm_merged_format = 1,
@@ -951,7 +951,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.dpcm_merged_chan = 1,
.dpcm_merged_rate = 1,
.dpcm_merged_format = 1,
@@ -965,7 +965,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(playback7),
},
[DAI_LINK_DL8_FE] = {
@@ -976,7 +976,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(playback8),
},
[DAI_LINK_DL10_FE] = {
@@ -987,7 +987,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(playback10),
},
[DAI_LINK_DL11_FE] = {
@@ -998,7 +998,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(playback11),
},
[DAI_LINK_UL1_FE] = {
@@ -1009,7 +1009,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(capture1),
},
[DAI_LINK_UL2_FE] = {
@@ -1020,7 +1020,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(capture2),
},
[DAI_LINK_UL3_FE] = {
@@ -1031,7 +1031,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(capture3),
},
[DAI_LINK_UL4_FE] = {
@@ -1042,7 +1042,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.dpcm_merged_chan = 1,
.dpcm_merged_rate = 1,
.dpcm_merged_format = 1,
@@ -1056,7 +1056,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.dpcm_merged_chan = 1,
.dpcm_merged_rate = 1,
.dpcm_merged_format = 1,
@@ -1070,7 +1070,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(capture6),
},
[DAI_LINK_UL8_FE] = {
@@ -1081,7 +1081,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(capture8),
},
[DAI_LINK_UL9_FE] = {
@@ -1092,7 +1092,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(capture9),
},
[DAI_LINK_UL10_FE] = {
@@ -1103,14 +1103,14 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(capture10),
},
/* BE */
[DAI_LINK_DL_SRC_BE] = {
.name = "DL_SRC_BE",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(dl_src),
},
[DAI_LINK_DPTX_BE] = {
@@ -1118,7 +1118,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_assertion = 1,
SND_SOC_DAILINK_REG(dptx),
},
[DAI_LINK_ETDM1_IN_BE] = {
@@ -1127,7 +1127,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_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(etdm1_in),
},
@@ -1137,7 +1137,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_assertion = 1,
SND_SOC_DAILINK_REG(etdm2_in),
},
[DAI_LINK_ETDM1_OUT_BE] = {
@@ -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_CBC_CFC,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(etdm1_out),
},
[DAI_LINK_ETDM2_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_assertion = 1,
SND_SOC_DAILINK_REG(etdm2_out),
},
[DAI_LINK_ETDM3_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_assertion = 1,
SND_SOC_DAILINK_REG(etdm3_out),
},
[DAI_LINK_PCM1_BE] = {
@@ -1173,14 +1173,14 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(pcm1),
},
[DAI_LINK_UL_SRC_BE] = {
.name = "UL_SRC_BE",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(ul_src),
},
@@ -1188,28 +1188,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_assertion = 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_assertion = 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_assertion = 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_assertion = 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 8b323fb19925..6ef5d0e9c015 100644
--- 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1,
SND_SOC_DAILINK_REG(capture_mono3),
},
{
@@ -790,15 +790,15 @@ 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_assertion = 1,
SND_SOC_DAILINK_REG(playback_hdmi),
},
/* Back End DAI links */
{
.name = "Primary Codec",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.init = mt8192_mt6359_init,
SND_SOC_DAILINK_REG(primary_codec),
@@ -806,29 +806,29 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "Primary Codec CH34",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(primary_codec_ch34),
},
{
.name = "AP_DMIC",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(ap_dmic),
},
{
.name = "AP_DMIC_CH34",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(ap_dmic_ch34),
},
{
.name = "I2S0",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s0),
@@ -836,7 +836,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S1",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s1),
@@ -844,7 +844,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S2",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s2),
@@ -852,7 +852,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S3",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s3),
@@ -860,7 +860,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S5",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s5),
@@ -868,7 +868,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S6",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s6),
@@ -876,7 +876,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S7",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s7),
@@ -884,7 +884,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S8",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
.init = mt8192_rt5682_init,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
@@ -894,7 +894,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "I2S9",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
SND_SOC_DAILINK_REG(i2s9),
@@ -903,23 +903,23 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
{
.name = "CONNSYS_I2S",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(connsys_i2s),
},
{
.name = "PCM 1",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm1),
},
{
.name = "PCM 2",
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(pcm2),
},
@@ -929,7 +929,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_assertion = 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 62e4e34cffbb..c9f4a2d5c52d 100644
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
@@ -912,7 +912,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &mtk_soundcard_common_playback_ops,
SND_SOC_DAILINK_REG(DL2_FE),
},
@@ -924,7 +924,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &mtk_soundcard_common_playback_ops,
SND_SOC_DAILINK_REG(DL3_FE),
},
@@ -936,7 +936,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &mtk_soundcard_common_playback_ops,
SND_SOC_DAILINK_REG(DL6_FE),
},
@@ -948,7 +948,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(DL7_FE),
},
[DAI_LINK_DL8_FE] = {
@@ -959,7 +959,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &mtk_soundcard_common_playback_ops,
SND_SOC_DAILINK_REG(DL8_FE),
},
@@ -971,7 +971,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &mt8195_hdmitx_dptx_playback_ops,
SND_SOC_DAILINK_REG(DL10_FE),
},
@@ -983,7 +983,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &mtk_soundcard_common_playback_ops,
SND_SOC_DAILINK_REG(DL11_FE),
},
@@ -995,7 +995,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(UL1_FE),
},
[DAI_LINK_UL2_FE] = {
@@ -1006,7 +1006,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &mtk_soundcard_common_capture_ops,
SND_SOC_DAILINK_REG(UL2_FE),
},
@@ -1018,7 +1018,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &mtk_soundcard_common_capture_ops,
SND_SOC_DAILINK_REG(UL3_FE),
},
@@ -1030,7 +1030,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &mtk_soundcard_common_capture_ops,
SND_SOC_DAILINK_REG(UL4_FE),
},
@@ -1042,7 +1042,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &mtk_soundcard_common_capture_ops,
SND_SOC_DAILINK_REG(UL5_FE),
},
@@ -1054,7 +1054,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(UL6_FE),
},
[DAI_LINK_UL8_FE] = {
@@ -1065,7 +1065,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &mtk_soundcard_common_capture_ops,
SND_SOC_DAILINK_REG(UL8_FE),
},
@@ -1077,7 +1077,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &mtk_soundcard_common_capture_ops,
SND_SOC_DAILINK_REG(UL9_FE),
},
@@ -1089,7 +1089,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = {
SND_SOC_DPCM_TRIGGER_POST,
},
.dynamic = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.ops = &mtk_soundcard_common_capture_ops,
SND_SOC_DAILINK_REG(UL10_FE),
},
@@ -1097,13 +1097,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_assertion = 1,
SND_SOC_DAILINK_REG(DL_SRC_BE),
},
[DAI_LINK_DPTX_BE] = {
.name = "DPTX_BE",
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.ops = &mt8195_dptx_ops,
.be_hw_params_fixup = mt8195_dptx_hw_params_fixup,
SND_SOC_DAILINK_REG(DPTX_BE),
@@ -1114,7 +1114,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_assertion = 1,
SND_SOC_DAILINK_REG(ETDM1_IN_BE),
},
[DAI_LINK_ETDM2_IN_BE] = {
@@ -1123,7 +1123,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_assertion = 1,
.be_hw_params_fixup = mt8195_etdm_hw_params_fixup,
SND_SOC_DAILINK_REG(ETDM2_IN_BE),
},
@@ -1133,7 +1133,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_assertion = 1,
.be_hw_params_fixup = mt8195_etdm_hw_params_fixup,
SND_SOC_DAILINK_REG(ETDM1_OUT_BE),
},
@@ -1143,7 +1143,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_assertion = 1,
SND_SOC_DAILINK_REG(ETDM2_OUT_BE),
},
[DAI_LINK_ETDM3_OUT_BE] = {
@@ -1152,7 +1152,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_assertion = 1,
SND_SOC_DAILINK_REG(ETDM3_OUT_BE),
},
[DAI_LINK_PCM1_BE] = {
@@ -1161,48 +1161,48 @@ 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,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(PCM1_BE),
},
[DAI_LINK_UL_SRC1_BE] = {
.name = "UL_SRC1_BE",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(UL_SRC1_BE),
},
[DAI_LINK_UL_SRC2_BE] = {
.name = "UL_SRC2_BE",
.no_pcm = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1,
.ops = &mt8195_sof_be_ops,
SND_SOC_DAILINK_REG(AFE_SOF_UL5),
},
diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c
index 110ae14dd7ea..35b284897d85 100644
--- a/sound/soc/samsung/odroid.c
+++ b/sound/soc/samsung/odroid.c
@@ -171,14 +171,14 @@ static struct snd_soc_dai_link odroid_card_dais[] = {
.name = "Primary",
.stream_name = "Primary",
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(primary),
}, {
/* BE <-> CODECs link */
.name = "I2S Mixer",
.ops = &odroid_card_be_ops,
.no_pcm = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS,
SND_SOC_DAILINK_REG(mixer),
@@ -189,7 +189,7 @@ static struct snd_soc_dai_link odroid_card_dais[] = {
.name = "Secondary",
.stream_name = "Secondary",
.dynamic = 1,
- .dpcm_playback = 1,
+ .playback_assertion = 1,
SND_SOC_DAILINK_REG(secondary),
}
};
@@ -278,8 +278,8 @@ static int odroid_audio_probe(struct platform_device *pdev)
/* Set capture capability only for boards with the MAX98090 CODEC */
if (codec_link->num_codecs > 1) {
- card->dai_link[0].dpcm_capture = 1;
- card->dai_link[1].dpcm_capture = 1;
+ card->dai_link[0].capture_assertion = 1;
+ card->dai_link[1].capture_assertion = 1;
}
priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1");
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 10/23] ASoC: soc-core: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (8 preceding siblings ...)
2024-04-18 4:13 ` [PATCH v3 09/23] ASoC: mediatek: " Kuninori Morimoto
@ 2024-04-18 4:13 ` Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 11/23] ASoC: soc-topology: " Kuninori Morimoto
` (13 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:13 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-core.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3ab6626ad680..6667f34e875a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2003,20 +2003,20 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
if (!dai_link->no_pcm) {
dai_link->no_pcm = 1;
- if (dai_link->dpcm_playback)
+ if (dai_link->playback_assertion)
dev_warn(card->dev,
- "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n",
+ "invalid configuration, dailink %s has flags no_pcm=0 and playback_assertion=1\n",
dai_link->name);
- if (dai_link->dpcm_capture)
+ if (dai_link->capture_assertion)
dev_warn(card->dev,
- "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n",
+ "invalid configuration, dailink %s has flags no_pcm=0 and capture_assertion=1\n",
dai_link->name);
/* convert normal link into DPCM one */
- if (!(dai_link->dpcm_playback ||
- dai_link->dpcm_capture)) {
- dai_link->dpcm_playback = !dai_link->capture_only;
- dai_link->dpcm_capture = !dai_link->playback_only;
+ if (!(dai_link->playback_assertion ||
+ dai_link->capture_assertion)) {
+ dai_link->playback_assertion = !dai_link->capture_only;
+ dai_link->capture_assertion = !dai_link->playback_only;
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 11/23] ASoC: soc-topology: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (9 preceding siblings ...)
2024-04-18 4:13 ` [PATCH v3 10/23] ASoC: soc-core: " Kuninori Morimoto
@ 2024-04-18 4:14 ` Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 12/23] ASoC: soc-compress: " Kuninori Morimoto
` (12 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:14 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-topology-test.c | 4 ++--
sound/soc/soc-topology.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c
index 70cbccc42a42..2740576cdf24 100644
--- a/sound/soc/soc-topology-test.c
+++ b/sound/soc/soc-topology-test.c
@@ -88,8 +88,8 @@ static struct snd_soc_dai_link kunit_dai_links[] = {
.nonatomic = 1,
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(dummy, dummy, platform),
},
};
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 90ca37e008b3..7d356765d25f 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1727,8 +1727,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
/* enable DPCM */
link->dynamic = 1;
link->ignore_pmdown_time = 1;
- link->dpcm_playback = le32_to_cpu(pcm->playback);
- link->dpcm_capture = le32_to_cpu(pcm->capture);
+ link->playback_assertion = le32_to_cpu(pcm->playback);
+ link->capture_assertion = le32_to_cpu(pcm->capture);
if (pcm->flag_mask)
set_link_flags(link,
le32_to_cpu(pcm->flag_mask),
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 12/23] ASoC: soc-compress: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (10 preceding siblings ...)
2024-04-18 4:14 ` [PATCH v3 11/23] ASoC: soc-topology: " Kuninori Morimoto
@ 2024-04-18 4:14 ` Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 13/23] ASoC: Intel: avs: boards: " Kuninori Morimoto
` (11 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:14 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-compress.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index e692aa3b8b22..347189ea30f9 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -610,8 +610,8 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
rtd->dai_link->stream_name);
ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, num,
- rtd->dai_link->dpcm_playback,
- rtd->dai_link->dpcm_capture, &be_pcm);
+ rtd->dai_link->playback_assertion,
+ rtd->dai_link->capture_assertion, &be_pcm);
if (ret < 0) {
dev_err(rtd->card->dev,
"Compress ASoC: can't create compressed for %s: %d\n",
@@ -624,9 +624,9 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
rtd->pcm = be_pcm;
rtd->fe_compr = 1;
- if (rtd->dai_link->dpcm_playback)
+ if (rtd->dai_link->playback_assertion)
be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd;
- if (rtd->dai_link->dpcm_capture)
+ if (rtd->dai_link->capture_assertion)
be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd;
memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops));
} else {
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 13/23] ASoC: Intel: avs: boards: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (11 preceding siblings ...)
2024-04-18 4:14 ` [PATCH v3 12/23] ASoC: soc-compress: " Kuninori Morimoto
@ 2024-04-18 4:14 ` Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 14/23] ASoC: ti: Replace playback/capture_only " Kuninori Morimoto
` (10 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:14 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/intel/avs/boards/da7219.c | 4 ++--
sound/soc/intel/avs/boards/dmic.c | 4 ++--
sound/soc/intel/avs/boards/es8336.c | 4 ++--
sound/soc/intel/avs/boards/hdaudio.c | 8 ++++----
sound/soc/intel/avs/boards/i2s_test.c | 4 ++--
sound/soc/intel/avs/boards/max98357a.c | 2 +-
sound/soc/intel/avs/boards/max98373.c | 4 ++--
sound/soc/intel/avs/boards/max98927.c | 4 ++--
sound/soc/intel/avs/boards/nau8825.c | 4 ++--
sound/soc/intel/avs/boards/rt274.c | 4 ++--
sound/soc/intel/avs/boards/rt286.c | 4 ++--
sound/soc/intel/avs/boards/rt298.c | 4 ++--
sound/soc/intel/avs/boards/rt5514.c | 2 +-
sound/soc/intel/avs/boards/rt5663.c | 4 ++--
sound/soc/intel/avs/boards/rt5682.c | 4 ++--
sound/soc/intel/avs/boards/ssm4567.c | 4 ++--
16 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c
index fc072dc58968..1137fc490369 100644
--- a/sound/soc/intel/avs/boards/da7219.c
+++ b/sound/soc/intel/avs/boards/da7219.c
@@ -203,8 +203,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->exit = avs_da7219_codec_exit;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c
index d9e5e85f5233..0035900c5237 100644
--- a/sound/soc/intel/avs/boards/dmic.c
+++ b/sound/soc/intel/avs/boards/dmic.c
@@ -22,7 +22,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
{
.name = "DMIC",
.id = 0,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
@@ -30,7 +30,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
{
.name = "DMIC WoV",
.id = 1,
- .dpcm_capture = 1,
+ .capture_assertion = 1,
.nonatomic = 1,
.no_pcm = 1,
.ignore_suspend = 1,
diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c
index ff3bd1513269..120fe60242dc 100644
--- a/sound/soc/intel/avs/boards/es8336.c
+++ b/sound/soc/intel/avs/boards/es8336.c
@@ -233,8 +233,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->ops = &avs_es8336_ops;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c
index 4433175814f8..b91fe6390894 100644
--- a/sound/soc/intel/avs/boards/hdaudio.c
+++ b/sound/soc/intel/avs/boards/hdaudio.c
@@ -39,8 +39,8 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int
dl[i].id = i;
dl[i].nonatomic = 1;
dl[i].no_pcm = 1;
- dl[i].dpcm_playback = 1;
- dl[i].dpcm_capture = 1;
+ dl[i].playback_assertion = 1;
+ dl[i].capture_assertion = 1;
dl[i].platforms = platform;
dl[i].num_platforms = 1;
dl[i].ignore_pmdown_time = 1;
@@ -160,8 +160,8 @@ static const struct snd_soc_dai_link probing_link = {
.id = -1,
.nonatomic = 1,
.no_pcm = 1,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
.cpus = &snd_soc_dummy_dlc,
.num_cpus = 1,
.init = avs_probing_link_init,
diff --git a/sound/soc/intel/avs/boards/i2s_test.c b/sound/soc/intel/avs/boards/i2s_test.c
index d41955685664..b1087aaa5348 100644
--- a/sound/soc/intel/avs/boards/i2s_test.c
+++ b/sound/soc/intel/avs/boards/i2s_test.c
@@ -46,8 +46,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->id = 0;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/max98357a.c b/sound/soc/intel/avs/boards/max98357a.c
index 1ff85e4d8e16..eeafdc3c4364 100644
--- a/sound/soc/intel/avs/boards/max98357a.c
+++ b/sound/soc/intel/avs/boards/max98357a.c
@@ -82,7 +82,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->be_hw_params_fixup = avs_max98357a_be_fixup;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_playback = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c
index 8d31586b73ea..1b561a0c6ec5 100644
--- a/sound/soc/intel/avs/boards/max98373.c
+++ b/sound/soc/intel/avs/boards/max98373.c
@@ -134,8 +134,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->be_hw_params_fixup = avs_max98373_be_fixup;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
dl->ignore_pmdown_time = 1;
dl->ops = &avs_max98373_ops;
diff --git a/sound/soc/intel/avs/boards/max98927.c b/sound/soc/intel/avs/boards/max98927.c
index 572ec58073d0..38188887b631 100644
--- a/sound/soc/intel/avs/boards/max98927.c
+++ b/sound/soc/intel/avs/boards/max98927.c
@@ -131,8 +131,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->be_hw_params_fixup = avs_max98927_be_fixup;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
dl->ignore_pmdown_time = 1;
dl->ops = &avs_max98927_ops;
diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c
index 3164745b1516..0dce214bbe49 100644
--- a/sound/soc/intel/avs/boards/nau8825.c
+++ b/sound/soc/intel/avs/boards/nau8825.c
@@ -210,8 +210,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->ops = &avs_nau8825_ops;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c
index e3aa28780df5..849583182c8c 100644
--- a/sound/soc/intel/avs/boards/rt274.c
+++ b/sound/soc/intel/avs/boards/rt274.c
@@ -183,8 +183,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->be_hw_params_fixup = avs_rt274_be_fixup;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c
index d24316fc4db9..881ac2139215 100644
--- a/sound/soc/intel/avs/boards/rt286.c
+++ b/sound/soc/intel/avs/boards/rt286.c
@@ -153,8 +153,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->ops = &avs_rt286_ops;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c
index 7fd28544f786..7df1b7711323 100644
--- a/sound/soc/intel/avs/boards/rt298.c
+++ b/sound/soc/intel/avs/boards/rt298.c
@@ -173,8 +173,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->ops = &avs_rt298_ops;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/rt5514.c b/sound/soc/intel/avs/boards/rt5514.c
index 097ae5f73241..8daf3a28c561 100644
--- a/sound/soc/intel/avs/boards/rt5514.c
+++ b/sound/soc/intel/avs/boards/rt5514.c
@@ -121,7 +121,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->be_hw_params_fixup = avs_rt5514_be_fixup;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
+ dl->capture_assertion = 1;
dl->ops = &avs_rt5514_ops;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c
index ba8c42d026da..89d476368791 100644
--- a/sound/soc/intel/avs/boards/rt5663.c
+++ b/sound/soc/intel/avs/boards/rt5663.c
@@ -171,8 +171,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->be_hw_params_fixup = avs_rt5663_be_fixup;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
dl->ops = &avs_rt5663_ops;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c
index 823f04dba2f7..2f236e4661db 100644
--- a/sound/soc/intel/avs/boards/rt5682.c
+++ b/sound/soc/intel/avs/boards/rt5682.c
@@ -242,8 +242,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->ops = &avs_rt5682_ops;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
*dai_link = dl;
diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c
index 9e78a3b91208..4c1864fb1c0a 100644
--- a/sound/soc/intel/avs/boards/ssm4567.c
+++ b/sound/soc/intel/avs/boards/ssm4567.c
@@ -121,8 +121,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
dl->be_hw_params_fixup = avs_ssm4567_be_fixup;
dl->nonatomic = 1;
dl->no_pcm = 1;
- dl->dpcm_capture = 1;
- dl->dpcm_playback = 1;
+ dl->capture_assertion = 1;
+ dl->playback_assertion = 1;
dl->ignore_pmdown_time = 1;
*dai_link = dl;
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 14/23] ASoC: ti: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (12 preceding siblings ...)
2024-04-18 4:14 ` [PATCH v3 13/23] ASoC: Intel: avs: boards: " Kuninori Morimoto
@ 2024-04-18 4:14 ` Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 15/23] ASoC: amd: " Kuninori Morimoto
` (9 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:14 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/ti/j721e-evm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/ti/j721e-evm.c b/sound/soc/ti/j721e-evm.c
index d9d1e021f5b2..a58c7d64c28e 100644
--- a/sound/soc/ti/j721e-evm.c
+++ b/sound/soc/ti/j721e-evm.c
@@ -670,7 +670,7 @@ static int j721e_soc_probe_cpb(struct j721e_priv *priv, int *link_idx,
priv->dai_links[*link_idx].platforms->of_node = dai_node;
priv->dai_links[*link_idx].codecs->of_node = codec_node;
priv->dai_links[*link_idx].codecs->dai_name = "pcm3168a-dac";
- priv->dai_links[*link_idx].playback_only = 1;
+ priv->dai_links[*link_idx].playback_assertion = 1;
priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_CPB;
priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT;
priv->dai_links[*link_idx].init = j721e_audio_init;
@@ -690,7 +690,7 @@ static int j721e_soc_probe_cpb(struct j721e_priv *priv, int *link_idx,
priv->dai_links[*link_idx].platforms->of_node = dai_node;
priv->dai_links[*link_idx].codecs->of_node = codec_node;
priv->dai_links[*link_idx].codecs->dai_name = "pcm3168a-adc";
- priv->dai_links[*link_idx].capture_only = 1;
+ priv->dai_links[*link_idx].capture_assertion = 1;
priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_CPB;
priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT;
priv->dai_links[*link_idx].init = j721e_audio_init;
@@ -787,7 +787,7 @@ static int j721e_soc_probe_ivi(struct j721e_priv *priv, int *link_idx,
priv->dai_links[*link_idx].codecs[0].dai_name = "pcm3168a-dac";
priv->dai_links[*link_idx].codecs[1].of_node = codecb_node;
priv->dai_links[*link_idx].codecs[1].dai_name = "pcm3168a-dac";
- priv->dai_links[*link_idx].playback_only = 1;
+ priv->dai_links[*link_idx].playback_assertion = 1;
priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_IVI;
priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT;
priv->dai_links[*link_idx].init = j721e_audio_init_ivi;
@@ -809,7 +809,7 @@ static int j721e_soc_probe_ivi(struct j721e_priv *priv, int *link_idx,
priv->dai_links[*link_idx].codecs[0].dai_name = "pcm3168a-adc";
priv->dai_links[*link_idx].codecs[1].of_node = codecb_node;
priv->dai_links[*link_idx].codecs[1].dai_name = "pcm3168a-adc";
- priv->dai_links[*link_idx].capture_only = 1;
+ priv->dai_links[*link_idx].capture_assertion = 1;
priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_IVI;
priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT;
priv->dai_links[*link_idx].init = j721e_audio_init;
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 15/23] ASoC: amd: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (13 preceding siblings ...)
2024-04-18 4:14 ` [PATCH v3 14/23] ASoC: ti: Replace playback/capture_only " Kuninori Morimoto
@ 2024-04-18 4:14 ` Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 16/23] ASoC: fsl: " Kuninori Morimoto
` (8 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:14 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/amd/ps/ps-mach.c | 2 +-
sound/soc/amd/renoir/acp3x-rn.c | 2 +-
sound/soc/amd/vangogh/acp5x-mach.c | 2 --
sound/soc/amd/yc/acp6x-mach.c | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/sound/soc/amd/ps/ps-mach.c b/sound/soc/amd/ps/ps-mach.c
index e675b8f569eb..3d8bac56e8b7 100644
--- a/sound/soc/amd/ps/ps-mach.c
+++ b/sound/soc/amd/ps/ps-mach.c
@@ -31,7 +31,7 @@ static struct snd_soc_dai_link acp63_dai_pdm[] = {
{
.name = "acp63-dmic-capture",
.stream_name = "DMIC capture",
- .capture_only = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(acp63_pdm, dmic_codec, pdm_platform),
},
};
diff --git a/sound/soc/amd/renoir/acp3x-rn.c b/sound/soc/amd/renoir/acp3x-rn.c
index 5d979a7b77fb..42b8d89fa8a1 100644
--- a/sound/soc/amd/renoir/acp3x-rn.c
+++ b/sound/soc/amd/renoir/acp3x-rn.c
@@ -29,7 +29,7 @@ static struct snd_soc_dai_link acp_dai_pdm[] = {
{
.name = "acp3x-dmic-capture",
.stream_name = "DMIC capture",
- .capture_only = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(acp_pdm, dmic_codec, platform),
},
};
diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c
index cd5b075d4b7e..cc902f857af3 100644
--- a/sound/soc/amd/vangogh/acp5x-mach.c
+++ b/sound/soc/amd/vangogh/acp5x-mach.c
@@ -289,7 +289,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = {
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBC_CFC,
.playback_assertion = 1,
- .playback_only = 1,
.ops = &acp5x_cs35l41_play_ops,
SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform),
},
@@ -388,7 +387,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = {
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBC_CFC,
.playback_assertion = 1,
- .playback_only = 1,
.ops = &acp5x_max98388_play_ops,
SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform),
},
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
index 1760b5d42460..a19f359bedae 100644
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@ -32,7 +32,7 @@ static struct snd_soc_dai_link acp6x_dai_pdm[] = {
{
.name = "acp6x-dmic-capture",
.stream_name = "DMIC capture",
- .capture_only = 1,
+ .capture_assertion = 1,
SND_SOC_DAILINK_REG(acp6x_pdm, dmic_codec, pdm_platform),
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 16/23] ASoC: fsl: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (14 preceding siblings ...)
2024-04-18 4:14 ` [PATCH v3 15/23] ASoC: amd: " Kuninori Morimoto
@ 2024-04-18 4:14 ` Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 17/23] ASoC: mxs: " Kuninori Morimoto
` (7 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:14 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/fsl/imx-hdmi.c | 12 ++++++------
sound/soc/fsl/imx-rpmsg.c | 10 +++++-----
sound/soc/fsl/imx-spdif.c | 10 +++++-----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/soc/fsl/imx-hdmi.c b/sound/soc/fsl/imx-hdmi.c
index e454085c6e5c..53ae87a7b640 100644
--- a/sound/soc/fsl/imx-hdmi.c
+++ b/sound/soc/fsl/imx-hdmi.c
@@ -143,8 +143,8 @@ static int imx_hdmi_probe(struct platform_device *pdev)
data->dai.cpus->dai_name = dev_name(&cpu_pdev->dev);
data->dai.platforms->of_node = cpu_np;
data->dai.ops = &imx_hdmi_ops;
- data->dai.playback_only = true;
- data->dai.capture_only = false;
+ data->dai.playback_assertion = true;
+ data->dai.capture_assertion = false;
data->dai.init = imx_hdmi_init;
put_device(&cpu_pdev->dev);
@@ -169,8 +169,8 @@ static int imx_hdmi_probe(struct platform_device *pdev)
}
if (hdmi_out) {
- data->dai.playback_only = true;
- data->dai.capture_only = false;
+ data->dai.playback_assertion = true;
+ data->dai.capture_assertion = false;
data->dai.codecs->dai_name = "i2s-hifi";
data->dai.codecs->name = "hdmi-audio-codec.1";
data->dai.dai_fmt = data->dai_fmt |
@@ -179,8 +179,8 @@ static int imx_hdmi_probe(struct platform_device *pdev)
}
if (hdmi_in) {
- data->dai.playback_only = false;
- data->dai.capture_only = true;
+ data->dai.playback_assertion = false;
+ data->dai.capture_assertion = true;
data->dai.codecs->dai_name = "i2s-hifi";
data->dai.codecs->name = "hdmi-audio-codec.2";
data->dai.dai_fmt = data->dai_fmt |
diff --git a/sound/soc/fsl/imx-rpmsg.c b/sound/soc/fsl/imx-rpmsg.c
index 0f1ad7ad7d27..2254b7c0c3ff 100644
--- a/sound/soc/fsl/imx-rpmsg.c
+++ b/sound/soc/fsl/imx-rpmsg.c
@@ -185,18 +185,18 @@ static int imx_rpmsg_probe(struct platform_device *pdev)
data->dai.platforms->name = platform_name;
else
data->dai.platforms->name = "rpmsg-audio-channel";
- data->dai.playback_only = true;
- data->dai.capture_only = true;
+ data->dai.playback_assertion = true;
+ data->dai.capture_assertion = true;
data->card.num_links = 1;
data->card.dai_link = &data->dai;
if (of_property_read_bool(np, "fsl,rpmsg-out"))
- data->dai.capture_only = false;
+ data->dai.capture_assertion = false;
if (of_property_read_bool(np, "fsl,rpmsg-in"))
- data->dai.playback_only = false;
+ data->dai.playback_assertion = false;
- if (data->dai.playback_only && data->dai.capture_only) {
+ if (data->dai.playback_assertion && data->dai.capture_assertion) {
dev_err(&pdev->dev, "no enabled rpmsg DAI link\n");
ret = -EINVAL;
goto fail;
diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
index 1e57939a7e29..aaf87eaf7607 100644
--- a/sound/soc/fsl/imx-spdif.c
+++ b/sound/soc/fsl/imx-spdif.c
@@ -47,16 +47,16 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
data->dai.name = "S/PDIF PCM";
data->dai.stream_name = "S/PDIF PCM";
data->dai.cpus->of_node = spdif_np;
- data->dai.playback_only = true;
- data->dai.capture_only = true;
+ data->dai.playback_assertion = true;
+ data->dai.capture_assertion = true;
if (of_property_read_bool(np, "spdif-out"))
- data->dai.capture_only = false;
+ data->dai.capture_assertion = false;
if (of_property_read_bool(np, "spdif-in"))
- data->dai.playback_only = false;
+ data->dai.playback_assertion = false;
- if (data->dai.playback_only && data->dai.capture_only) {
+ if (data->dai.playback_assertion && data->dai.capture_assertion) {
dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n");
goto end;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 17/23] ASoC: mxs: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (15 preceding siblings ...)
2024-04-18 4:14 ` [PATCH v3 16/23] ASoC: fsl: " Kuninori Morimoto
@ 2024-04-18 4:14 ` Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 18/23] ASoC: atmel: " Kuninori Morimoto
` (6 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:14 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/mxs/mxs-sgtl5000.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
index 310e3ac77424..829337320d17 100644
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -78,14 +78,14 @@ static struct snd_soc_dai_link mxs_sgtl5000_dai[] = {
.stream_name = "HiFi Playback",
.dai_fmt = MXS_SGTL5000_DAI_FMT,
.ops = &mxs_sgtl5000_hifi_ops,
- .playback_only = true,
+ .playback_assertion = true,
SND_SOC_DAILINK_REG(hifi_tx),
}, {
.name = "HiFi Rx",
.stream_name = "HiFi Capture",
.dai_fmt = MXS_SGTL5000_DAI_FMT,
.ops = &mxs_sgtl5000_hifi_ops,
- .capture_only = true,
+ .capture_assertion = true,
SND_SOC_DAILINK_REG(hifi_rx),
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 18/23] ASoC: atmel: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (16 preceding siblings ...)
2024-04-18 4:14 ` [PATCH v3 17/23] ASoC: mxs: " Kuninori Morimoto
@ 2024-04-18 4:15 ` Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 19/23] ASoC: Intel: " Kuninori Morimoto
` (5 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:15 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/atmel/sam9g20_wm8731.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index d3ec9826d505..264017d3cf7c 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -98,7 +98,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBP_CFP,
#ifndef ENABLE_MIC_INPUT
- .playback_only = true,
+ .playback_assertion = true,
#endif
SND_SOC_DAILINK_REG(pcm),
};
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 19/23] ASoC: Intel: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (17 preceding siblings ...)
2024-04-18 4:15 ` [PATCH v3 18/23] ASoC: atmel: " Kuninori Morimoto
@ 2024-04-18 4:15 ` Kuninori Morimoto
2024-04-18 11:19 ` Amadeusz Sławiński
2024-04-18 4:15 ` [PATCH v3 20/23] ASoC: samsung: " Kuninori Morimoto
` (4 subsequent siblings)
23 siblings, 1 reply; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:15 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/intel/boards/bdw-rt5677.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c
index 54e3c5d3c251..9170b1d509e2 100644
--- a/sound/soc/intel/boards/bdw-rt5677.c
+++ b/sound/soc/intel/boards/bdw-rt5677.c
@@ -339,7 +339,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
{
.name = "Codec DSP",
.stream_name = "Wake on Voice",
- .capture_only = 1,
+ .capture_assertion = 1,
.ops = &bdw_rt5677_dsp_ops,
SND_SOC_DAILINK_REG(dsp),
},
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 19/23] ASoC: Intel: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:15 ` [PATCH v3 19/23] ASoC: Intel: " Kuninori Morimoto
@ 2024-04-18 11:19 ` Amadeusz Sławiński
2024-04-18 16:26 ` Pierre-Louis Bossart
0 siblings, 1 reply; 39+ messages in thread
From: Amadeusz Sławiński @ 2024-04-18 11:19 UTC (permalink / raw)
To: Kuninori Morimoto, Alexandre Belloni, Alper Nebi Yasak,
AngeloGioacchino Del Regno, Banajit Goswami, Bard Liao, Brent Lu,
Cezary Rojewski, Charles Keepax, Claudiu Beznea,
Cristian Ciocaltea, Daniel Baluta, Hans de Goede,
Jaroslav Kysela, Jerome Brunet, Jiawei Wang, Jonathan Corbet,
Kai Vehmanen, Kevin Hilman, Liam Girdwood, Mark Brown,
Maso Huang, Matthias Brugger, Neil Armstrong, Nicolas Ferre,
Peter Ujfalusi, Pierre-Louis Bossart, Ranjani Sridharan,
Sascha Hauer, Shawn Guo, Shengjiu Wang, Srinivas Kandagatla,
Sylwester Nawrocki, Takashi Iwai, Vinod Koul, Xiubo Li,
alsa-devel, imx, linux-doc, linux-sound
On 4/18/2024 6:15 AM, Kuninori Morimoto wrote:
> soc_get_playback_capture() is now handling DPCM and normal
> comprehensively for playback/capture stream in same code.
> This patch converts xxx_only flag to xxx_assertion.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> sound/soc/intel/boards/bdw-rt5677.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c
> index 54e3c5d3c251..9170b1d509e2 100644
> --- a/sound/soc/intel/boards/bdw-rt5677.c
> +++ b/sound/soc/intel/boards/bdw-rt5677.c
> @@ -339,7 +339,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
> {
> .name = "Codec DSP",
> .stream_name = "Wake on Voice",
> - .capture_only = 1,
> + .capture_assertion = 1,
> .ops = &bdw_rt5677_dsp_ops,
> SND_SOC_DAILINK_REG(dsp),
> },
Should this have been part of patch 8?
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 19/23] ASoC: Intel: Replace playback/capture_only to playback/capture_assertion
2024-04-18 11:19 ` Amadeusz Sławiński
@ 2024-04-18 16:26 ` Pierre-Louis Bossart
2024-04-19 7:31 ` Amadeusz Sławiński
0 siblings, 1 reply; 39+ messages in thread
From: Pierre-Louis Bossart @ 2024-04-18 16:26 UTC (permalink / raw)
To: Amadeusz Sławiński, Kuninori Morimoto,
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi, Ranjani Sridharan,
Sascha Hauer, Shawn Guo, Shengjiu Wang, Srinivas Kandagatla,
Sylwester Nawrocki, Takashi Iwai, Vinod Koul, Xiubo Li,
alsa-devel, imx, linux-doc, linux-sound
On 4/18/24 06:19, Amadeusz Sławiński wrote:
> On 4/18/2024 6:15 AM, Kuninori Morimoto wrote:
>> soc_get_playback_capture() is now handling DPCM and normal
>> comprehensively for playback/capture stream in same code.
>> This patch converts xxx_only flag to xxx_assertion.
>>
>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> ---
>> sound/soc/intel/boards/bdw-rt5677.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/sound/soc/intel/boards/bdw-rt5677.c
>> b/sound/soc/intel/boards/bdw-rt5677.c
>> index 54e3c5d3c251..9170b1d509e2 100644
>> --- a/sound/soc/intel/boards/bdw-rt5677.c
>> +++ b/sound/soc/intel/boards/bdw-rt5677.c
>> @@ -339,7 +339,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
>> {
>> .name = "Codec DSP",
>> .stream_name = "Wake on Voice",
>> - .capture_only = 1,
>> + .capture_assertion = 1,
>> .ops = &bdw_rt5677_dsp_ops,
>> SND_SOC_DAILINK_REG(dsp),
>> },
>
> Should this have been part of patch 8?
Patch 8 deals with the following changes
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
This case is about
> - .capture_only = 1,
> + .capture_assertion = 1,
I think it's good to make this change separately.
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v3 19/23] ASoC: Intel: Replace playback/capture_only to playback/capture_assertion
2024-04-18 16:26 ` Pierre-Louis Bossart
@ 2024-04-19 7:31 ` Amadeusz Sławiński
0 siblings, 0 replies; 39+ messages in thread
From: Amadeusz Sławiński @ 2024-04-19 7:31 UTC (permalink / raw)
To: Pierre-Louis Bossart, Kuninori Morimoto, Alexandre Belloni,
Alper Nebi Yasak, AngeloGioacchino Del Regno, Banajit Goswami,
Bard Liao, Brent Lu, Cezary Rojewski, Charles Keepax,
Claudiu Beznea, Cristian Ciocaltea, Daniel Baluta, Hans de Goede,
Jaroslav Kysela, Jerome Brunet, Jiawei Wang, Jonathan Corbet,
Kai Vehmanen, Kevin Hilman, Liam Girdwood, Mark Brown,
Maso Huang, Matthias Brugger, Neil Armstrong, Nicolas Ferre,
Peter Ujfalusi, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
On 4/18/2024 6:26 PM, Pierre-Louis Bossart wrote:
>
>
> On 4/18/24 06:19, Amadeusz Sławiński wrote:
>> On 4/18/2024 6:15 AM, Kuninori Morimoto wrote:
>>> soc_get_playback_capture() is now handling DPCM and normal
>>> comprehensively for playback/capture stream in same code.
>>> This patch converts xxx_only flag to xxx_assertion.
>>>
>>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>>> ---
>>> sound/soc/intel/boards/bdw-rt5677.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/sound/soc/intel/boards/bdw-rt5677.c
>>> b/sound/soc/intel/boards/bdw-rt5677.c
>>> index 54e3c5d3c251..9170b1d509e2 100644
>>> --- a/sound/soc/intel/boards/bdw-rt5677.c
>>> +++ b/sound/soc/intel/boards/bdw-rt5677.c
>>> @@ -339,7 +339,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
>>> {
>>> .name = "Codec DSP",
>>> .stream_name = "Wake on Voice",
>>> - .capture_only = 1,
>>> + .capture_assertion = 1,
>>> .ops = &bdw_rt5677_dsp_ops,
>>> SND_SOC_DAILINK_REG(dsp),
>>> },
>>
>> Should this have been part of patch 8?
>
> Patch 8 deals with the following changes
>
> - .dpcm_playback = 1,
> - .dpcm_capture = 1,
> + .playback_assertion = 1,
> + .capture_assertion = 1,
>
> This case is about
>
>> - .capture_only = 1,
>> + .capture_assertion = 1,
>
> I think it's good to make this change separately.
Indeed, missed that.
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3 20/23] ASoC: samsung: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (18 preceding siblings ...)
2024-04-18 4:15 ` [PATCH v3 19/23] ASoC: Intel: " Kuninori Morimoto
@ 2024-04-18 4:15 ` Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 21/23] ASoC: generic: " Kuninori Morimoto
` (3 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:15 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/samsung/odroid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c
index 35b284897d85..6370122b0310 100644
--- a/sound/soc/samsung/odroid.c
+++ b/sound/soc/samsung/odroid.c
@@ -184,7 +184,7 @@ static struct snd_soc_dai_link odroid_card_dais[] = {
SND_SOC_DAILINK_REG(mixer),
}, {
/* Secondary FE <-> BE link */
- .playback_only = 1,
+ .playback_assertion = 1,
.ops = &odroid_card_fe_ops,
.name = "Secondary",
.stream_name = "Secondary",
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 21/23] ASoC: generic: Replace playback/capture_only to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (19 preceding siblings ...)
2024-04-18 4:15 ` [PATCH v3 20/23] ASoC: samsung: " Kuninori Morimoto
@ 2024-04-18 4:15 ` Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 22/23] ASoC: soc-pcm: remove dpcm_playback/capture and playback/capture_only Kuninori Morimoto
` (2 subsequent siblings)
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:15 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/simple_card_utils.h | 2 +-
sound/soc/generic/audio-graph-card2.c | 8 ++++----
sound/soc/generic/simple-card-utils.c | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index ad67957b7b48..42e464090cf3 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -196,7 +196,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
struct snd_soc_dai_link_component *dlc, int *is_single_link);
int graph_util_parse_link_direction(struct device_node *np,
- bool *is_playback_only, bool *is_capture_only);
+ bool *playback_assertion, bool *capture_assertion);
#ifdef DEBUG
static inline void simple_util_debug_dai(struct simple_util_priv *priv,
diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 0d2ac4c9ba3d..3007b95eeaaa 100644
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -759,7 +759,7 @@ static void graph_link_init(struct simple_util_priv *priv,
struct device_node *ep;
struct device_node *ports;
unsigned int daifmt = 0, daiclk = 0;
- bool playback_only = 0, capture_only = 0;
+ bool playback_assertion = 0, capture_assertion = 0;
unsigned int bit_frame = 0;
if (graph_lnk_is_multi(port)) {
@@ -798,10 +798,10 @@ static void graph_link_init(struct simple_util_priv *priv,
if (is_cpu_node)
daiclk = snd_soc_daifmt_clock_provider_flipped(daiclk);
- graph_util_parse_link_direction(port, &playback_only, &capture_only);
+ graph_util_parse_link_direction(port, &playback_assertion, &capture_assertion);
- dai_link->playback_only = playback_only;
- dai_link->capture_only = capture_only;
+ dai_link->playback_assertion = playback_assertion;
+ dai_link->capture_assertion = capture_assertion;
dai_link->dai_fmt = daifmt | daiclk;
dai_link->init = simple_util_dai_init;
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index b4876b4f259d..48233f410348 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -1127,7 +1127,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
EXPORT_SYMBOL_GPL(graph_util_parse_dai);
int graph_util_parse_link_direction(struct device_node *np,
- bool *playback_only, bool *capture_only)
+ bool *playback_assertion, bool *capture_assertion)
{
bool is_playback_only = false;
bool is_capture_only = false;
@@ -1138,8 +1138,8 @@ int graph_util_parse_link_direction(struct device_node *np,
if (is_playback_only && is_capture_only)
return -EINVAL;
- *playback_only = is_playback_only;
- *capture_only = is_capture_only;
+ *playback_assertion = is_playback_only;
+ *capture_assertion = is_capture_only;
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 22/23] ASoC: soc-pcm: remove dpcm_playback/capture and playback/capture_only
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (20 preceding siblings ...)
2024-04-18 4:15 ` [PATCH v3 21/23] ASoC: generic: " Kuninori Morimoto
@ 2024-04-18 4:15 ` Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 23/23] ASoC: doc: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
2024-04-22 21:10 ` [PATCH v3 00/23] ASoC: " Pierre-Louis Bossart
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:15 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
No driver is using dpcm_playback/capture and playback/capture_only flag,
let's remove these.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc.h | 8 --------
sound/soc/soc-core.c | 7 -------
sound/soc/soc-pcm.c | 18 ------------------
3 files changed, 33 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e604d74f6e33..37602141834b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -787,10 +787,6 @@ struct snd_soc_dai_link {
/* Mark this pcm with non atomic ops */
unsigned int nonatomic:1;
- /* For unidirectional dai links */
- unsigned int playback_only:1;
- unsigned int capture_only:1;
-
/* Keep DAI active over suspend */
unsigned int ignore_suspend:1;
@@ -805,10 +801,6 @@ struct snd_soc_dai_link {
/* This DAI link can route to other DAI links at runtime (Frontend)*/
unsigned int dynamic:1;
- /* DPCM capture and Playback support */
- unsigned int dpcm_capture:1;
- unsigned int dpcm_playback:1;
-
/*
* Capture / Playback support assertion. Having assertion flag is not mandatory.
* In case of having assertion flag, non specific side will be disabled.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6667f34e875a..64270a4f75c6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2011,13 +2011,6 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
dev_warn(card->dev,
"invalid configuration, dailink %s has flags no_pcm=0 and capture_assertion=1\n",
dai_link->name);
-
- /* convert normal link into DPCM one */
- if (!(dai_link->playback_assertion ||
- dai_link->capture_assertion)) {
- dai_link->playback_assertion = !dai_link->capture_only;
- dai_link->capture_assertion = !dai_link->playback_only;
- }
}
/*
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a79ca115f4e7..4ceca99e266f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2808,24 +2808,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
return -EINVAL;
}
- /*
- * REMOVE ME
- *
- * dpcm_playback/capture will be used as playback/capture_assertion
- */
- if (dai_link->playback_only && dai_link->capture_only) {
- dev_err(rtd->dev, "both playback_only / capture_only are set\n");
- return -EINVAL;
- }
- if (dai_link->playback_only)
- dai_link->playback_assertion = 1;
- if (dai_link->capture_only)
- dai_link->capture_assertion = 1;
- if (dai_link->dpcm_playback)
- dai_link->playback_assertion = 1;
- if (dai_link->dpcm_capture)
- dai_link->capture_assertion = 1;
-
/* Adapt stream for codec2codec links */
cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK);
cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE);
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH v3 23/23] ASoC: doc: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (21 preceding siblings ...)
2024-04-18 4:15 ` [PATCH v3 22/23] ASoC: soc-pcm: remove dpcm_playback/capture and playback/capture_only Kuninori Morimoto
@ 2024-04-18 4:15 ` Kuninori Morimoto
2024-04-22 21:10 ` [PATCH v3 00/23] ASoC: " Pierre-Louis Bossart
23 siblings, 0 replies; 39+ messages in thread
From: Kuninori Morimoto @ 2024-04-18 4:15 UTC (permalink / raw)
To: "Amadeusz Sławiński",
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi,
Pierre-Louis Bossart, Ranjani Sridharan, Sascha Hauer, Shawn Guo,
Shengjiu Wang, Srinivas Kandagatla, Sylwester Nawrocki,
Takashi Iwai, Vinod Koul, Xiubo Li, alsa-devel, imx, linux-doc,
linux-sound
.dpcm_playback/capture flags are converted to playback/capture_assertion
flag. Let's follow it on Documentation.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
Documentation/sound/soc/dpcm.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/sound/soc/dpcm.rst b/Documentation/sound/soc/dpcm.rst
index 2d7ad1d91504..bf9b454e6654 100644
--- a/Documentation/sound/soc/dpcm.rst
+++ b/Documentation/sound/soc/dpcm.rst
@@ -157,14 +157,14 @@ FE DAI links are defined as follows :-
.codec_dai_name = "snd-soc-dummy-dai",
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
- .dpcm_playback = 1,
+ .playback_assertion = 1,
},
.....< other FE and BE DAI links here >
};
This FE DAI link is pretty similar to a regular DAI link except that we also
set the DAI link to a DPCM FE with the ``dynamic = 1``. The supported FE stream
-directions should also be set with the ``dpcm_playback`` and ``dpcm_capture``
+directions can set with the ``playback_assertion`` and ``capture_assertion``
flags. There is also an option to specify the ordering of the trigger call for
each FE. This allows the ASoC core to trigger the DSP before or after the other
components (as some DSPs have strong requirements for the ordering DAI/DSP
@@ -189,15 +189,15 @@ The BE DAIs are configured as follows :-
.ignore_pmdown_time = 1,
.be_hw_params_fixup = hswult_ssp0_fixup,
.ops = &haswell_ops,
- .dpcm_playback = 1,
- .dpcm_capture = 1,
+ .playback_assertion = 1,
+ .capture_assertion = 1,
},
.....< other BE DAI links here >
};
This BE DAI link connects DAI0 to the codec (in this case RT5460 AIF1). It sets
the ``no_pcm`` flag to mark it has a BE and sets flags for supported stream
-directions using ``dpcm_playback`` and ``dpcm_capture`` above.
+directions using ``playback_assertion`` and ``capture_assertion`` above.
The BE has also flags set for ignoring suspend and PM down time. This allows
the BE to work in a hostless mode where the host CPU is not transferring data
--
2.25.1
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
` (22 preceding siblings ...)
2024-04-18 4:15 ` [PATCH v3 23/23] ASoC: doc: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
@ 2024-04-22 21:10 ` Pierre-Louis Bossart
23 siblings, 0 replies; 39+ messages in thread
From: Pierre-Louis Bossart @ 2024-04-22 21:10 UTC (permalink / raw)
To: Kuninori Morimoto, Amadeusz Sławiński,
Alexandre Belloni, Alper Nebi Yasak, AngeloGioacchino Del Regno,
Banajit Goswami, Bard Liao, Brent Lu, Cezary Rojewski,
Charles Keepax, Claudiu Beznea, Cristian Ciocaltea,
Daniel Baluta, Hans de Goede, Jaroslav Kysela, Jerome Brunet,
Jiawei Wang, Jonathan Corbet, Kai Vehmanen, Kevin Hilman,
Liam Girdwood, Mark Brown, Maso Huang, Matthias Brugger,
Neil Armstrong, Nicolas Ferre, Peter Ujfalusi, Ranjani Sridharan,
Sascha Hauer, Shawn Guo, Shengjiu Wang, Srinivas Kandagatla,
Sylwester Nawrocki, Takashi Iwai, Vinod Koul, Xiubo Li,
alsa-devel, imx, linux-doc, linux-sound, Brent Lu
Hi Morimoto-san,
> When we use DPCM, we need to set dpcm_playback/capture flag.
> If these flag are set, soc_get_playback_capture() will check its
> availability, but non DPCM doesn't need such special flags.
>
> OTOH, it cares playback/capture_only flag. It is needed.
>
> This patch adds new assertion flag, and convert current dpcm_playback
> dpcm_capture flag and playback/capture_only flag to it.
The Intel CI flags a regression on a CometLake "Helios" Chromebook with
this patchset
https://github.com/thesofproject/linux/pull/4937
Apr 19 14:01:22 jf-cml-hel-rt5682-07 kernel: SSP1-Codec: SSP1-Codec
capture assertion check error
Apr 19 14:01:22 jf-cml-hel-rt5682-07 kernel: sof_rt5682 cml_rt5682_def:
ASoC: can't create pcm SSP1-Codec :-22
https://github.com/thesofproject/linux/pull/4937
I don't have any specific knowledge on this device, hope Brent Lu can
shed some light on what is so special about this SSP1.
Regards,
-Pierre
^ permalink raw reply [flat|nested] 39+ messages in thread