ASoC: replace dpcm_playback/capture to playback/capture_only
Subsystems (12)
cover ASoC: replace dpcm_playback/capture to playback/capture_only
Hi Mark
Current ASoC can use DPCM, and we need to set dpcm_playback/capture to use it. OTOH, we are using playback/capture_only flag on Normal/Codec2Codec case. I think it is very duplicated, we can share same rules for all cases.
This patch-set cleanup these.
1 - 7 : cleanup functions.
8 : main patch
9 - 19 : replace flags on each drivers
20 : remove old flags
Kuninori Morimoto (20):
1 ASoC: soc-pcm.c: indicate error if stream has no playback no capture 2 ASoC: soc-pcm.c: use dai_link on soc_get_playback_capture() 3 ASoC: soc-pcm.c: cleanup soc_get_playback_capture() error 4 ASoC: soc-pcm.c: use temporary variable at soc_get_playback_capture() 5 ASoC: soc-pcm.c: tidyup playback/capture_only at soc_get_playback_capture() 6 ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part1 7 ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part2 8 ASoC: soc-pcm.c: cleanup soc_get_playback_capture() 9 ASoC: amd: replace dpcm_playback/capture to playback/capture_only 10 ASoC: fsl: replace dpcm_playback/capture to playback/capture_only 11 ASoC: sof: replace dpcm_playback/capture to playback/capture_only 12 ASoC: meson: replace dpcm_playback/capture to playback/capture_only 13 ASoC: Intel: replace dpcm_playback/capture to playback/capture_only 14 ASoC: samsung: replace dpcm_playback/capture to playback/capture_only 15 ASoC: mediatek: replace dpcm_playback/capture to playback/capture_only 16 ASoC: soc-dai.c: replace dpcm_playback/capture to playback/capture_only 17 ASoC: soc-core.c: replace dpcm_playback/capture to playback/capture_only 18 ASoC: soc-topology.c: replace dpcm_playback/capture to playback/capture_only 19 ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only 20 ASoC: soc-pcm.c: remove dpcm_playback/capture
include/sound/soc.h | 4 - sound/soc/amd/acp-da7219-max98357a.c | 20 ++-- sound/soc/amd/acp-es8336.c | 2 - sound/soc/amd/acp/acp-mach-common.c | 20 +--- sound/soc/amd/acp3x-rt5682-max9836.c | 6 +- sound/soc/amd/vangogh/acp5x-mach.c | 3 - sound/soc/fsl/fsl-asoc-card.c | 16 +-- sound/soc/fsl/imx-audmix.c | 6 +- sound/soc/fsl/imx-card.c | 4 +- sound/soc/intel/avs/boards/da7219.c | 2 - sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/hdaudio.c | 4 - sound/soc/intel/avs/boards/i2s_test.c | 2 - sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 - sound/soc/intel/avs/boards/max98927.c | 2 - sound/soc/intel/avs/boards/nau8825.c | 2 - sound/soc/intel/avs/boards/rt274.c | 2 - sound/soc/intel/avs/boards/rt286.c | 2 - sound/soc/intel/avs/boards/rt298.c | 2 - sound/soc/intel/avs/boards/rt5682.c | 2 - sound/soc/intel/avs/boards/ssm4567.c | 2 - sound/soc/intel/boards/bdw-rt5650.c | 4 - sound/soc/intel/boards/bdw-rt5677.c | 4 - sound/soc/intel/boards/bdw_rt286.c | 10 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 32 +++--- sound/soc/intel/boards/bxt_rt298.c | 26 ++--- sound/soc/intel/boards/bytcht_cx2072x.c | 6 +- sound/soc/intel/boards/bytcht_da7213.c | 6 +- sound/soc/intel/boards/bytcht_es8316.c | 6 +- sound/soc/intel/boards/bytcht_nocodec.c | 6 +- sound/soc/intel/boards/bytcr_rt5640.c | 6 +- sound/soc/intel/boards/bytcr_rt5651.c | 6 +- sound/soc/intel/boards/bytcr_wm5102.c | 6 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 14 +-- sound/soc/intel/boards/ehl_rt5660.c | 14 +-- sound/soc/intel/boards/glk_rt5682_max98357a.c | 30 +++-- sound/soc/intel/boards/hsw_rt5640.c | 10 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 26 ++--- sound/soc/intel/boards/kbl_da7219_max98927.c | 54 ++++----- sound/soc/intel/boards/kbl_rt5660.c | 18 ++- sound/soc/intel/boards/kbl_rt5663_max98927.c | 44 ++++--- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 22 ++-- sound/soc/intel/boards/skl_hda_dsp_common.c | 14 +-- .../soc/intel/boards/skl_nau88l25_max98357a.c | 26 ++--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 26 ++--- sound/soc/intel/boards/skl_rt286.c | 26 ++--- sound/soc/intel/boards/sof_cs42l42.c | 12 +- sound/soc/intel/boards/sof_da7219_max98373.c | 16 +-- sound/soc/intel/boards/sof_es8336.c | 8 +- sound/soc/intel/boards/sof_nau8825.c | 12 +- sound/soc/intel/boards/sof_pcm512x.c | 8 +- sound/soc/intel/boards/sof_rt5682.c | 12 +- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_ssp_amp.c | 11 +- sound/soc/intel/boards/sof_wm8804.c | 2 - sound/soc/mediatek/mt2701/mt2701-cs42448.c | 20 +--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 24 ++-- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +- .../mediatek/mt8183/mt8183-da7219-max98357.c | 34 +++--- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 34 +++--- .../mt8186/mt8186-mt6366-da7219-max98357.c | 86 ++++++-------- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 86 ++++++-------- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 48 ++++---- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 +++++----- sound/soc/meson/axg-card.c | 8 +- sound/soc/meson/meson-card-utils.c | 4 +- sound/soc/samsung/odroid.c | 10 +- sound/soc/soc-compress.c | 11 +- sound/soc/soc-core.c | 20 +--- sound/soc/soc-dai.c | 4 +- sound/soc/soc-pcm.c | 107 +++++++----------- sound/soc/soc-topology-test.c | 2 - sound/soc/soc-topology.c | 4 +- sound/soc/sof/nocodec.c | 4 - 84 files changed, 502 insertions(+), 842 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/20 ASoC: soc-pcm.c: indicate error if stream has no playback no capture
soc_get_playback_capture() (A) returns number of substreams for playback/capture (B).
ASoC will probe the Sound Card and mapps CPU<->Codec pair.
(A) static int soc_get_playback_capture(...,
(B) int *playback, int *capture)
{
...
if (rtd->dai_link->playback_only) {
*playback = 1;
*capture = 0;
}
if (rtd->dai_link->capture_only) {
*playback = 0;
*capture = 1;
}
(C)
return 0;
}But it might be no playback no capture if it returns playback=0, capture=0. It is very difficult to notice about it. This patch indicates error at (C) then.
--- sound/soc/soc-pcm.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/soc-pcm.c +7 -0
@@ -2815,6 +2815,13 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, *capture =1 ; } +if (!*playback && !*capture) { +dev_err (rtd->dev,"substream %s has no playback, no capture\n" , + rtd->dai_link->stream_name); + +return -EINVAL ; + } +return 0 ; }
Signature · 1 line
2.25.1
Re: [PATCH 01/20] ASoC: soc-pcm.c: indicate error if stream has no playback no capture
Quoted 21 lines · Kuninori Morimoto
soc_get_playback_capture()(A) returns number of substreams for playback/capture (B).
ASoC will probe the Sound Card and mapps CPU<->Codec pair.(A) static int soc_get_playback_capture(...,
(B) int *playback, int *capture){ ... if (rtd->dai_link->playback_only) { *playback = 1; *capture = 0; } if (rtd->dai_link->capture_only) { *playback = 0; *capture = 1; } (C) return 0; }
Quoted 6 lines
But it might be no playback no capture if it returns playback=0, capture=0. It is very difficult to notice about it. This patch indicates error at (C) then.
Signed-off-by Kuninori Morimoto <[email protected]>---
PATCH 2/20 ASoC: soc-pcm.c: use dai_link on soc_get_playback_capture()
In reply to Kuninori Morimotosoc_get_playback_capture() (A) is using rtd->dai_link->xxx everywhere. Because of that, 1 line is unnecessarily long and not readable.
(A) static int soc_get_playback_capture(...)
{
if (rtd->dai_link->dynamic ...) {
^^^^^^^^^^^^^
...
} else {
int cpu_capture = rtd->dai_link->c2c_params ?
^^^^^^^^^^^^^
...
}
if (rtd->dai_link->playback_only) {
^^^^^^^^^^^^^
...
}
...
}This patch uses variable "dai_link" to be clear code. Nothing changes the meanings.
--- sound/soc/soc-pcm.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
sound/soc/soc-pcm.c +14 -13
@@ -2731,19 +2731,20 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)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 *cpu_dai;int i; -if (rtd->dai_link->dynamic && rtd->dai_link->num_cpus >1 ) { +if (dai_link->dynamic && dai_link->num_cpus >1 ) {dev_err (rtd->dev,"DPCM doesn't support Multi CPU for Front-Ends yet\n" );return -EINVAL ; } -if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) { +if (dai_link->dynamic || dai_link->no_pcm) {int stream; -if (rtd->dai_link->dpcm_playback) { +if (dai_link->dpcm_playback) { stream =SNDRV_PCM_STREAM_PLAYBACK ;for_each_rtd_cpu_dais (rtd, i, cpu_dai) {
@@ -2755,11 +2756,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,if (!*playback) {dev_err (rtd->card->dev,"No CPU DAIs support playback for stream %s\n" , - rtd->dai_link->stream_name); + dai_link->stream_name);return -EINVAL ; } } -if (rtd->dai_link->dpcm_capture) { +if (dai_link->dpcm_capture) { stream =SNDRV_PCM_STREAM_CAPTURE ;for_each_rtd_cpu_dais (rtd, i, cpu_dai) {
@@ -2772,7 +2773,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,if (!*capture) {dev_err (rtd->card->dev,"No CPU DAIs support capture for stream %s\n" , - rtd->dai_link->stream_name); + dai_link->stream_name);return -EINVAL ; } }
@@ -2780,15 +2781,15 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *codec_dai;/* Adapt stream for codec2codec links */ -int cpu_capture = rtd->dai_link->c2c_params ? +int cpu_capture = dai_link->c2c_params ?SNDRV_PCM_STREAM_PLAYBACK :SNDRV_PCM_STREAM_CAPTURE ; -int cpu_playback = rtd->dai_link->c2c_params ? +int cpu_playback = dai_link->c2c_params ?SNDRV_PCM_STREAM_CAPTURE :SNDRV_PCM_STREAM_PLAYBACK ;for_each_rtd_codec_dais (rtd, i, codec_dai) { -if (rtd->dai_link->num_cpus ==1 ) { +if (dai_link->num_cpus ==1 ) { cpu_dai =asoc_rtd_to_cpu (rtd,0 ); - }else if (rtd->dai_link->num_cpus == rtd->dai_link->num_codecs) { + }else if (dai_link->num_cpus == dai_link->num_codecs) { cpu_dai =asoc_rtd_to_cpu (rtd, i); }else { dev_err(rtd->card->dev,
@@ -2805,19 +2806,19 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, } } -if (rtd->dai_link->playback_only) { +if (dai_link->playback_only) { *playback =1 ; *capture =0 ; } -if (rtd->dai_link->capture_only) { +if (dai_link->capture_only) { *playback =0 ; *capture =1 ; }if (!*playback && !*capture) {dev_err (rtd->dev,"substream %s has no playback, no capture\n" , - rtd->dai_link->stream_name); + dai_link->stream_name);return -EINVAL ; }
Signature · 1 line
2.25.1
Re: [PATCH 02/20] ASoC: soc-pcm.c: use dai_link on soc_get_playback_capture()
Quoted 21 lines · Kuninori Morimoto
soc_get_playback_capture()(A) is usingrtd->dai_link->xxxeverywhere. Because of that, 1 line is unnecessarily long and not readable.(A) static int
soc_get_playback_capture(...){ if (rtd->dai_link->dynamic ...) { ^^^^^^^^^^^^^ ... } else { int cpu_capture = rtd->dai_link->c2c_params ? ^^^^^^^^^^^^^ ... } if (rtd->dai_link->playback_only) { ^^^^^^^^^^^^^ ... } ... }
Quoted 5 lines
This patch uses variable "
dai_link" to be clear code. Nothing changes the meanings.Signed-off-by Kuninori Morimoto <[email protected]>---
PATCH 3/20 ASoC: soc-pcm.c: cleanup soc_get_playback_capture() error
In reply to Kuninori Morimotosoc_get_playback_capture() (A) checks dai_link status, and indicate error if it was not matching (B).
(A) static int soc_get_playback_capture(...)
{
... ^ if (dai_link->dynamic && dai_link->num_cpus > 1) {
| dev_err(rtd->dev,
(B) "DPCM doesn't support Multi CPU for Front-Ends yet\n");
| return -EINVAL;
v }
... }
We can use 100 char for 1 line today. This patch cleanup error code line.
--- sound/soc/soc-pcm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-pcm.c +1 -2
@@ -2736,8 +2736,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,int i;if (dai_link->dynamic && dai_link->num_cpus >1 ) { -dev_err (rtd->dev, -"DPCM doesn't support Multi CPU for Front-Ends yet\n" ); +dev_err (rtd->dev,"DPCM doesn't support Multi CPU for Front-Ends yet\n" );return -EINVAL ; }
Signature · 1 line
2.25.1
Re: [PATCH 03/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture() error
Quoted 11 lines · Kuninori Morimoto
soc_get_playback_capture()(A) checksdai_linkstatus, and indicate error if it was not matching (B).(A) static int
soc_get_playback_capture(...){ ...^ if (
dai_link->dynamic&&dai_link->num_cpus> 1) {
| dev_err(rtd->dev,
(B) "DPCM doesn't support Multi CPU for Front-Ends yet\n");
| return-EINVAL;
v }
Quoted 7 lines
... }We can use 100 char for 1 line today. This patch cleanup error code line.
Signed-off-by Kuninori Morimoto <[email protected]>---
PATCH 4/20 ASoC: soc-pcm.c: use temporary variable at soc_get_playback_capture()
In reply to Kuninori Morimotosoc_get_playback_capture() (A) returns number of substreams for playback/capture (B).
(A) static int soc_get_playback_capture(...,
(B) int *playback, int *capture)
{
...
for_each_xxx(...) {
if (xxx)
return -EINVAL;
=> *playback = 1;
...
=> *capture = 1;
...
}
...
}But, it is directly updating playback/capture which is the result of this function even though it might be error. It should be updated in case of succeed only. This patch updates it.
--- sound/soc/soc-pcm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
sound/soc/soc-pcm.c +16 -11
@@ -2733,6 +2733,8 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, {struct snd_soc_dai_link *dai_link = rtd->dai_link;struct snd_soc_dai *cpu_dai; +int tmp_playback =0 ; +int tmp_capture =0 ;int i;if (dai_link->dynamic && dai_link->num_cpus >1 ) {
@@ -2748,11 +2750,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,for_each_rtd_cpu_dais (rtd, i, cpu_dai) {if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - *playback =1 ; + tmp_playback =1 ;break ; } } -if (!*playback) { +if (!tmp_playback) {dev_err (rtd->card->dev,"No CPU DAIs support playback for stream %s\n" , dai_link->stream_name);
@@ -2764,12 +2766,12 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,for_each_rtd_cpu_dais (rtd, i, cpu_dai) {if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - *capture =1 ; + tmp_capture =1 ;break ; } } -if (!*capture) { +if (!tmp_capture) {dev_err (rtd->card->dev,"No CPU DAIs support capture for stream %s\n" , dai_link->stream_name);
@@ -2798,30 +2800,33 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) &&snd_soc_dai_stream_valid (cpu_dai, cpu_playback)) - *playback =1 ; + tmp_playback =1 ;if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) &&snd_soc_dai_stream_valid (cpu_dai, cpu_capture)) - *capture =1 ; + tmp_capture =1 ; } }if (dai_link->playback_only) { - *playback =1 ; - *capture =0 ; + tmp_playback =1 ; + tmp_capture =0 ; }if (dai_link->capture_only) { - *playback =0 ; - *capture =1 ; + tmp_playback =0 ; + tmp_capture =1 ; } -if (!*playback && !*capture) { +if (!tmp_playback && !tmp_capture) {dev_err (rtd->dev,"substream %s has no playback, no capture\n" , dai_link->stream_name);return -EINVAL ; } + *playback = tmp_playback; + *capture = tmp_capture; +return 0 ; }
Signature · 1 line
2.25.1
Re: [PATCH 04/20] ASoC: soc-pcm.c: use temporary variable at soc_get_playback_capture()
Quoted 32 lines · Kuninori Morimoto
soc_get_playback_capture()(A) returns number of substreams for playback/capture (B).(A) static int soc_get_playback_capture(...,
(B) int *playback, int *capture){ ... for_each_xxx(...) { if (xxx) return -EINVAL; => *playback = 1; ... => *capture = 1; ... } ... }But, it is directly updating playback/capture which is the result of this function even though it might be error. It should be updated in case of succeed only. This patch updates it.
Signed-off-by Kuninori Morimoto <[email protected]>--- sound/soc/soc-pcm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)sound/soc/soc-pcm.c +0
-0
sound/soc/soc-pcm.c static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, · line 2739
Quoted 7 lines
sound/soc/soc-pcm.c +2
-0@@ -2733,6 +2733,8 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, {struct snd_soc_dai_link *dai_link = rtd->dai_link;struct snd_soc_dai *cpu_dai; +int tmp_playback =0 ; +int tmp_capture =0 ;int i;
Maybe name it something more descriptive, like "has_playback" and "has_capture", I think it would make core more readable in context?
Re: [PATCH 04/20] ASoC: soc-pcm.c: use temporary variable at soc_get_playback_capture()
Hi Amadeusz
Quoted 10 lines
sound/soc/soc-pcm.c static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, · line 2738
Quoted 7 lines
{ struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *cpu_dai;sound/soc/soc-pcm.c +2
-0+int tmp_playback =0 ; +int tmp_capture =0 ;int i;Maybe name it something more descriptive, like "
has_playback" and "has_capture", I think it would make core more readable in context?
Thanks, will do in v2 patch
Thank you for your help !!
Best regards
---
Kuninori Morimoto
PATCH 5/20 ASoC: soc-pcm.c: tidyup playback/capture_only at soc_get_playback_capture()
In reply to Kuninori Morimotosoc_get_playback_capture() (A) returns number of substreams for playback/capture, and then, we can use playback/capture_only flag (X)(Y).
(A) static int soc_get_playback_capture(...)
{
...
(X) if (dai_link->playback_only) {
(*) *playback = 1;
*capture = 0;
}(Y) if (dai_link->capture_only) {
*playback = 0;
(*) *capture = 1;
}
...
}But this flag should not have effect to opposite side stream (*). This patch tidyup it.
--- sound/soc/soc-pcm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/soc-pcm.c +2 -6
@@ -2807,15 +2807,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, } } -if (dai_link->playback_only) { - tmp_playback =1 ; +if (dai_link->playback_only) tmp_capture =0 ; - } -if (dai_link->capture_only) { +if (dai_link->capture_only) tmp_playback =0 ; - tmp_capture =1 ; - }if (!tmp_playback && !tmp_capture) { dev_err(rtd->dev, "substream %s has no playback, no capture\n",
Signature · 1 line
2.25.1
Re: [PATCH 05/20] ASoC: soc-pcm.c: tidyup playback/capture_only at soc_get_playback_capture()
Quoted 18 lines · Kuninori Morimoto
soc_get_playback_capture()(A) returns number of substreams for playback/capture, and then, we can use playback/capture_only flag (X)(Y).(A) static int
soc_get_playback_capture(...){ ... (X) if (dai_link->playback_only) { (*) *playback = 1; *capture = 0; }(Y) if (dai_link->capture_only) { *playback = 0; (*) *capture = 1; } ... }
Quoted 5 lines
But this flag should not have effect to opposite side stream (*). This patch tidyup it.
Signed-off-by Kuninori Morimoto <[email protected]>---
PATCH 6/20 ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part1
In reply to Kuninori Morimotosoc_get_playback_capture() (A) is handling both DPCM (X) / Normal (Y) connection.
(A) static int soc_get_playback_capture(...)
{
... ^ if (dai_link->dynamic || dai_link->no_pcm) {
(X) ...
v
^ } else {
| ...
|(@) for_each_rtd_codec_dais(rtd, i, codec_dai) {
| if (dai_link->num_cpus == 1) {
|(a) cpu_dai = ...
(Y) } else if (dai_link->num_cpus == dai_link->num_codecs) {
|(b) cpu_dai = ...
| } else {
|(c) dev_err(...);
| }
| ...
| }
| ...
v }
...
}In Normal connection case (Y), it is checking number of CPU / Codec.
(a) is for Single CPU case
(b) is for Multi CPU case
(c) is for other case (error)
Because this loop (@) is not related to dai_link->num_xxx, we can judge (c) before entering this loop.
And it is needed not only for Normal connection case (Y), but DPCM connection case (X) too.
This patch moves (c) to top side.
--- sound/soc/soc-pcm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
sound/soc/soc-pcm.c +6 -4
@@ -2742,6 +2742,12 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,return -EINVAL ; } +if (dai_link->num_cpus != dai_link->num_codecs) { +dev_err (rtd->dev,"%s: %d cpus to %d codecs link is not supported yet\n" , + dai_link->name, dai_link->num_cpus, dai_link->num_codecs); +return -EINVAL ; + } +if (dai_link->dynamic || dai_link->no_pcm) {int stream;
@@ -2792,10 +2798,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, cpu_dai =asoc_rtd_to_cpu (rtd,0 ); }else if (dai_link->num_cpus == dai_link->num_codecs) { cpu_dai =asoc_rtd_to_cpu (rtd, i); - }else { -dev_err (rtd->card->dev, -"N cpus to M codecs link is not supported yet\n" ); -return -EINVAL ; } if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
Signature · 1 line
2.25.1
Re: [PATCH 06/20] ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part1
Quoted 36 lines · Kuninori Morimoto
soc_get_playback_capture()(A) is handling both DPCM (X) / Normal (Y) connection.(A) static int
soc_get_playback_capture(...){ ...^ if (
dai_link->dynamic||dai_link->no_pcm) {
(X) ...
v
^ } else {| ... |(@) for_each_rtd_codec_dais(rtd, i, codec_dai) { | if (dai_link->num_cpus == 1) { |(a) cpu_dai = ... (Y) } else if (dai_link->num_cpus == dai_link->num_codecs) { |(b) cpu_dai = ... | } else { |(c) dev_err(...); | } | ... | } | ... v } ... }In Normal connection case (Y), it is checking number of CPU / Codec.
(a) is for Single CPU case
(b) is for Multi CPU case
(c) is for other case (error)Because this loop (@) is not related to
dai_link->num_xxx, we can judge (c) before entering this loop.
And it is needed not only for Normal connection case (Y), but DPCM connection case (X) too.
Quoted 4 lines
This patch moves (c) to top side.
Signed-off-by Kuninori Morimoto <[email protected]>---
PATCH 7/20 ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part2
In reply to Kuninori Morimotosoc_get_playback_capture() (A) is handling both DPCM (X) / Normal (Y) connection.
(A) static int soc_get_playback_capture(...)
{
... ^ if (dai_link->dynamic || dai_link->no_pcm) {
(X) ...
v
^ } else {
| ...
| for_each_rtd_codec_dais(rtd, i, codec_dai) {
| if (dai_link->num_cpus == 1) {
|(a) cpu_dai = ...
(Y) } else if (dai_link->num_cpus == dai_link->num_codecs) {
|(b) cpu_dai = ...
| }
| ...
| }
| ...
v }
...
}In Normal connection case (Y), it is checking number of CPU / Codec.
(a) is for Single CPU case
(b) is for Multi CPU case
We can simply merge (a) and (b). Because it is doing same judgement, same operation.
--- sound/soc/soc-pcm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
sound/soc/soc-pcm.c +1 -5
@@ -2794,11 +2794,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, SNDRV_PCM_STREAM_CAPTURE :SNDRV_PCM_STREAM_PLAYBACK ;for_each_rtd_codec_dais (rtd, i, codec_dai) { -if (dai_link->num_cpus ==1 ) { - cpu_dai =asoc_rtd_to_cpu (rtd,0 ); - }else if (dai_link->num_cpus == dai_link->num_codecs) { - cpu_dai =asoc_rtd_to_cpu (rtd, i); - } + cpu_dai =asoc_rtd_to_cpu (rtd, i);if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) &&snd_soc_dai_stream_valid (cpu_dai, cpu_playback))
Signature · 1 line
2.25.1
Re: [PATCH 07/20] ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part2
Quoted 28 lines · Kuninori Morimoto
soc_get_playback_capture()(A) is handling both DPCM (X) / Normal (Y) connection.(A) static int
soc_get_playback_capture(...){ ...^ if (
dai_link->dynamic||dai_link->no_pcm) {
(X) ...
v
^ } else {| ... | for_each_rtd_codec_dais(rtd, i, codec_dai) { | if (dai_link->num_cpus == 1) { |(a) cpu_dai = ... (Y) } else if (dai_link->num_cpus == dai_link->num_codecs) { |(b) cpu_dai = ... | } | ... | } | ... v } ... }In Normal connection case (Y), it is checking number of CPU / Codec.
(a) is for Single CPU case
(b) is for Multi CPU case
Quoted 5 lines
We can simply merge (a) and (b). Because it is doing same judgement, same operation.
Signed-off-by Kuninori Morimoto <[email protected]>---
PATCH 8/20 ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
In reply to Kuninori MorimotoCurrent 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_codec_dais(rtd, i, codec_dai) {
|(*) ...
v v }
} ... }
(*) part is checking each DAI's availability.
At first, (X) part is for DPCM, and it checks playback/capture availability if dai_link has dpcm_playback/capture flag (a)(b). But we are already using playback/capture_only flag.
for Normal (Y) and Codec2Codec (Z). We can use this flags for DPCM too.
Before After
dpcm_playback = 1; => /* no flags */ dpcm_capture = 1; dpcm_playback = 1; => playback_only = 1; dpcm_capture = 1; => capture_only = 1;
This patch enables both flags case, but dpcm_playback/capture flags will be removed if all driver were switched to new playback/capture_only flags.
Here, CPU <-> Codec relationship is like this
DPCM [CPU/dummy]-[dummy/Codec] ^^^^^^^^^^^ Normal [CPU/Codec] ^^^^^^^^^^^
(X) part is checking only CPU DAI, and
(Y) part is checking both CPU/Codec DAI
This means (X)/(Y) are checking same position.
Because dammy DAI is always available,
we can share same code for all cases (= X/Y/Z).
This patch merge these.
--- sound/soc/soc-pcm.c | 75 +++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 53 deletions(-)
sound/soc/soc-pcm.c +22 -53
@@ -2732,7 +2732,10 @@ 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 *codec_dai;struct snd_soc_dai *cpu_dai; +int cpu_capture =SNDRV_PCM_STREAM_CAPTURE ; +int cpu_playback =SNDRV_PCM_STREAM_PLAYBACK ;int tmp_playback =0 ;int tmp_capture =0 ;int i;
@@ -2748,61 +2751,27 @@ 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 ; +/* Adapt stream for codec2codec links */ +if (dai_link->c2c_params) { + cpu_capture =SNDRV_PCM_STREAM_PLAYBACK ; + cpu_playback =SNDRV_PCM_STREAM_CAPTURE ; + } -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { -if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - tmp_playback =1 ; -break ; - } - } -if (!tmp_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 */ +if (dai_link->dpcm_playback && !dai_link->dpcm_capture) + dai_link->playback_only =1 ; +if (!dai_link->dpcm_playback && dai_link->dpcm_capture) + dai_link->capture_only =1 ; -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { -if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - tmp_capture =1 ; -break ; - } - } - -if (!tmp_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 *codec_dai; - -/* Adapt stream for codec2codec links */ -int cpu_capture = dai_link->c2c_params ? -SNDRV_PCM_STREAM_PLAYBACK :SNDRV_PCM_STREAM_CAPTURE ; -int cpu_playback = dai_link->c2c_params ? -SNDRV_PCM_STREAM_CAPTURE :SNDRV_PCM_STREAM_PLAYBACK ; - -for_each_rtd_codec_dais (rtd, i, codec_dai) { - cpu_dai =asoc_rtd_to_cpu (rtd, i); - -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && -snd_soc_dai_stream_valid (cpu_dai, cpu_playback)) - tmp_playback =1 ; -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && -snd_soc_dai_stream_valid (cpu_dai, cpu_capture)) - tmp_capture =1 ; - } +for_each_rtd_cpu_dais (rtd, i, cpu_dai) { + codec_dai =asoc_rtd_to_codec (rtd, i);/* get paired codec */ + +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && +snd_soc_dai_stream_valid (cpu_dai, cpu_playback)) + tmp_playback =1 ; +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && +snd_soc_dai_stream_valid (cpu_dai, cpu_capture)) + tmp_capture =1 ; }if (dai_link->playback_only)
Signature · 1 line
2.25.1
Re: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
Quoted 65 lines · Kuninori Morimoto
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) intcpu_capture= ...
| v intcpu_playback= ...
(Y)
| ^for_each_rtd_codec_dais(rtd, i, codec_dai){
|(*) ...
v v }} ... }(*) part is checking each DAI's availability.
At first, (X) part is for DPCM, and it checks playback/capture availability if
dai_linkhas dpcm_playback/capture flag (a)(b). But we are already using playback/capture_only flag.
for Normal (Y) and Codec2Codec (Z). We can use this flags for DPCM too.Before After
dpcm_playback = 1; => /* no flags */ dpcm_capture = 1; dpcm_playback = 1; => playback_only = 1; dpcm_capture = 1; => capture_only = 1;This patch enables both flags case, but dpcm_playback/capture flags will be removed if all driver were switched to new playback/capture_only flags.
Here, CPU <-> Codec relationship is like this
DPCM [CPU/dummy]-[dummy/Codec] ^^^^^^^^^^^ Normal [CPU/Codec] ^^^^^^^^^^^(X) part is checking only CPU DAI, and
(Y) part is checking both CPU/Codec DAI
Quoted 8 lines
This means (X)/(Y) are checking same position.
Because dammy DAI is always available,
we can share same code for all cases (= X/Y/Z).This patch merge these.
Signed-off-by Kuninori Morimoto <[email protected]>---
Re: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
In reply to Kuninori MorimotoQuoted 162 lines · Kuninori Morimoto
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) intcpu_capture= ...
| v intcpu_playback= ...
(Y)
| ^for_each_rtd_codec_dais(rtd, i, codec_dai){
|(*) ...
v v }} ... }(*) part is checking each DAI's availability.
At first, (X) part is for DPCM, and it checks playback/capture availability if
dai_linkhas dpcm_playback/capture flag (a)(b). But we are already using playback/capture_only flag.
for Normal (Y) and Codec2Codec (Z). We can use this flags for DPCM too.Before After
dpcm_playback = 1; => /* no flags */ dpcm_capture = 1; dpcm_playback = 1; => playback_only = 1; dpcm_capture = 1; => capture_only = 1;This patch enables both flags case, but dpcm_playback/capture flags will be removed if all driver were switched to new playback/capture_only flags.
Here, CPU <-> Codec relationship is like this
DPCM [CPU/dummy]-[dummy/Codec] ^^^^^^^^^^^ Normal [CPU/Codec] ^^^^^^^^^^^(X) part is checking only CPU DAI, and
(Y) part is checking both CPU/Codec DAIThis means (X)/(Y) are checking same position.
Because dammy DAI is always available,
we can share same code for all cases (= X/Y/Z).This patch merge these.
Signed-off-by Kuninori Morimoto <[email protected]>--- sound/soc/soc-pcm.c | 75 +++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 53 deletions(-)sound/soc/soc-pcm.c +15
-53@@ -2732,7 +2732,10 @@ 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 *codec_dai;struct snd_soc_dai *cpu_dai; +int cpu_capture =SNDRV_PCM_STREAM_CAPTURE ; +int cpu_playback =SNDRV_PCM_STREAM_PLAYBACK ;int tmp_playback =0 ;int tmp_capture =0 ;int i;@@ -2748,61 +2751,27 @@ 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 ; +/* Adapt stream for codec2codec links */ +if (dai_link->c2c_params) { + cpu_capture =SNDRV_PCM_STREAM_PLAYBACK ; + cpu_playback =SNDRV_PCM_STREAM_CAPTURE ; + } -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { -if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - tmp_playback =1 ; -break ; - } - } -if (!tmp_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 */ +if (dai_link->dpcm_playback && !dai_link->dpcm_capture) + dai_link->playback_only =1 ; +if (!dai_link->dpcm_playback && dai_link->dpcm_capture) + dai_link->capture_only =1 ; -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { -if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - tmp_capture =1 ; -break ; - } - } - -if (!tmp_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 *codec_dai; - -/* Adapt stream for codec2codec links */ -int cpu_capture = dai_link->c2c_params ? -SNDRV_PCM_STREAM_PLAYBACK :SNDRV_PCM_STREAM_CAPTURE ; -int cpu_playback = dai_link->c2c_params ? -SNDRV_PCM_STREAM_CAPTURE :SNDRV_PCM_STREAM_PLAYBACK ; - -for_each_rtd_codec_dais (rtd, i, codec_dai) { - cpu_dai =asoc_rtd_to_cpu (rtd, i); - -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && -snd_soc_dai_stream_valid (cpu_dai, cpu_playback)) - tmp_playback =1 ; -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && -snd_soc_dai_stream_valid (cpu_dai, cpu_capture)) - tmp_capture =1 ; - } +for_each_rtd_cpu_dais (rtd, i, cpu_dai) { + codec_dai =asoc_rtd_to_codec (rtd, i);/* get paired codec */
sound/soc/soc-pcm.c static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, · line 2777
Quoted 10 lines
sound/soc/soc-pcm.c +7
-0+ +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && +snd_soc_dai_stream_valid (cpu_dai, cpu_playback)) + tmp_playback =1 ; +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && +snd_soc_dai_stream_valid (cpu_dai, cpu_capture)) + tmp_capture =1 ; }if (dai_link->playback_only)
I put the patchset to test and it fails to enumerate devices on our platforms.
Bisect leads me to this patch, here is dmesg fragment:
[ 34.609909] snd_soc_avs:avs_component_probe: avs_hdaudio avs_hdaudio.2: probing hdaudioB0D2-platform card hdaudioB0D2 [ 34.612274] snd_soc_core:soc_tplg_load_header: avs_hdaudio avs_hdaudio.2: ASoC: Got 0x490 bytes of type 8 version 0 vendor 0 at pass 0 [ 34.612456] snd_soc_core:soc_tplg_load_header: avs_hdaudio avs_hdaudio.2: ASoC: Got 0x7ec bytes of type 5 version 0 vendor 0 at pass 3 [ 34.612477] snd_soc_core:soc_tplg_dapm_widget_elems_load: avs_hdaudio avs_hdaudio.2: ASoC: adding 6 DAPM widgets [ 34.612493] snd_soc_core:soc_tplg_dapm_widget_create: avs_hdaudio avs_hdaudio.2: ASoC: creating DAPM widget hdmi1_fe id 17 [ 34.612774] snd_soc_core:soc_tplg_dapm_widget_create: avs_hdaudio avs_hdaudio.2: ASoC: creating DAPM widget hdmi1_be id 17 [ 34.613025] snd_soc_core:soc_tplg_dapm_widget_create: avs_hdaudio avs_hdaudio.2: ASoC: creating DAPM widget hdmi2_fe id 17 [ 34.613297] snd_soc_core:soc_tplg_dapm_widget_create: avs_hdaudio avs_hdaudio.2: ASoC: creating DAPM widget hdmi2_be id 17 [ 34.613552] snd_soc_core:soc_tplg_dapm_widget_create: avs_hdaudio avs_hdaudio.2: ASoC: creating DAPM widget hdmi3_fe id 17 [ 34.613823] snd_soc_core:soc_tplg_dapm_widget_create: avs_hdaudio avs_hdaudio.2: ASoC: creating DAPM widget hdmi3_be id 17 [ 34.614077] snd_soc_core:soc_tplg_load_header: avs_hdaudio avs_hdaudio.2: ASoC: Got 0xab0 bytes of type 7 version 0 vendor 0 at pass 4 [ 34.614272] snd_soc_core:snd_soc_register_dai: snd_soc_avs 0000:00:0e.0: ASoC: Registered DAI 'HDMI1-dai' [ 34.614290] snd_soc_core:snd_soc_dapm_new_dai_widgets: snd_soc_avs 0000:00:0e.0: ASoC: adding HDMI1-playback widget [ 34.614453] snd_soc_core:snd_soc_add_pcm_runtime: avs_hdaudio avs_hdaudio.2: ASoC: binding HDMI1 [ 34.615192] snd_soc_core:snd_soc_register_dai: snd_soc_avs 0000:00:0e.0: ASoC: Registered DAI 'HDMI2-dai' [ 34.615210] snd_soc_core:snd_soc_dapm_new_dai_widgets: snd_soc_avs 0000:00:0e.0: ASoC: adding HDMI2-playback widget [ 34.615371] snd_soc_core:snd_soc_add_pcm_runtime: avs_hdaudio avs_hdaudio.2: ASoC: binding HDMI2 [ 34.616060] snd_soc_core:snd_soc_register_dai: snd_soc_avs 0000:00:0e.0: ASoC: Registered DAI 'HDMI3-dai' [ 34.616077] snd_soc_core:snd_soc_dapm_new_dai_widgets: snd_soc_avs 0000:00:0e.0: ASoC: adding HDMI3-playback widget [ 34.616235] snd_soc_core:snd_soc_add_pcm_runtime: avs_hdaudio avs_hdaudio.2: ASoC: binding HDMI3 [ 34.616858] snd_soc_core:soc_tplg_pcm_elems_load: avs_hdaudio avs_hdaudio.2: ASoC: adding 3 PCM DAIs [ 34.616876] snd_soc_core:soc_tplg_load_header: avs_hdaudio avs_hdaudio.2: ASoC: Got 0x4a4 bytes of type 4 version 0 vendor 0 at pass 5 [ 34.616895] snd_soc_core:soc_tplg_dapm_graph_elems_load: avs_hdaudio avs_hdaudio.2: ASoC: adding 9 DAPM routes for index 0 [ 34.617601] avs_hdaudio avs_hdaudio.2: ASoC: Parent card not yet available, widget card binding deferred [ 34.618153] snd_soc_core:snd_soc_add_pcm_runtime: avs_hdaudio avs_hdaudio.2: ASoC: binding hdaudioB0D2 link0 [ 34.618724] snd_soc_core:snd_soc_add_pcm_runtime: avs_hdaudio avs_hdaudio.2: ASoC: binding hdaudioB0D2 link1 [ 34.619221] snd_soc_core:snd_soc_add_pcm_runtime: avs_hdaudio avs_hdaudio.2: ASoC: binding hdaudioB0D2 link2 [ 34.619973] probing-LINK: substream (null) has no playback, no capture [ 34.620016] avs_hdaudio avs_hdaudio.2: ASoC: can't create pcm (null) :-22 [ 34.620196] snd_soc_core:snd_soc_unregister_dai: snd_soc_avs 0000:00:0e.0: ASoC: Unregistered DAI 'hdaudioB0D2-cpu0' [ 34.620309] snd_soc_core:snd_soc_unregister_dai: snd_soc_avs 0000:00:0e.0: ASoC: Unregistered DAI 'hdaudioB0D2-cpu1' [ 34.620419] snd_soc_core:snd_soc_unregister_dai: snd_soc_avs 0000:00:0e.0: ASoC: Unregistered DAI 'hdaudioB0D2-cpu2' [ 34.621254] snd_soc_core:snd_soc_unregister_dai: snd_soc_avs 0000:00:0e.0: ASoC: Unregistered DAI 'HDMI3-dai' [ 34.621837] snd_soc_core:snd_soc_unregister_dai: snd_soc_avs 0000:00:0e.0: ASoC: Unregistered DAI 'HDMI2-dai' [ 34.622704] snd_soc_core:snd_soc_unregister_dai: snd_soc_avs 0000:00:0e.0: ASoC: Unregistered DAI 'HDMI1-dai' [ 34.623620] snd_soc_core:snd_soc_unregister_dai: snd_hda_codec_hdmi hdaudioB0D2: ASoC: Unregistered DAI 'HDMI 0' [ 34.623695] snd_soc_core:snd_soc_unregister_dai: snd_hda_codec_hdmi hdaudioB0D2: ASoC: Unregistered DAI 'HDMI 1' [ 34.623769] snd_soc_core:snd_soc_unregister_dai: snd_hda_codec_hdmi hdaudioB0D2: ASoC: Unregistered DAI 'HDMI 2' [ 34.624779] snd_hda_core:snd_hdac_display_power: snd_soc_avs 0000:00:0e.0: display power disable [ 34.628057] avs_hdaudio: probe of avs_hdaudio.2 failed with error -22
Re: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
Hi Amadeusz
Thank you for testing
Quoted 4 lines
I put the patchset to test and it fails to enumerate devices on our platforms.
Bisect leads me to this patch, here is dmesg fragment:
(snip)
Quoted 2 lines
[ 34.617601] avs_hdaudio avs_hdaudio.2: ASoC: Parent card not yetavailable, widget card binding deferred
(snip)
Quoted 1 line
[ 34.619973] probing-LINK: substream (null) has no playback, no capture
Hmm.. I tested it on my many type of connections, but couldn't reproduce the error...
It seems you got [01/20] patch error = no playback, no capture. This means has_playback/capture both flags are 0.
It seems you are using soc-topology.
Is it topology specific something ?
But hmm.. ?
static int soc_get_playback_capture(...)
{
...
(A) if (dai_link->dynamic || dai_link->no_pcm) {
...
if (dai_link->dpcm_playback) {
...
(B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
...
}
...
}
if (dai_link->dpcm_capture) {
...
(B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
...
}
}
...
}
}It checks CPU (B) when no_pcm (A) on original.
But I think "no_pcm - CPU" is dummy DAI -> above check is no meaning. After the patch, it checks both CPU/Codec.
I wonder is your Codec which is connected to no_pcm DAI valid ?
Thank you for your help !!
Best regards
---
Kuninori Morimoto
Re: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
Quoted 48 lines · Kuninori Morimoto
Hi Amadeusz
Thank you for testing
Quoted 4 lines
I put the patchset to test and it fails to enumerate devices on our platforms.
Bisect leads me to this patch, here is dmesg fragment:
(snip)
Quoted 2 lines
[ 34.617601] avs_hdaudio avs_hdaudio.2: ASoC: Parent card not yetavailable, widget card binding deferred
(snip)
Quoted 1 line
[ 34.619973] probing-LINK: substream (null) has no playback, no captureHmm.. I tested it on my many type of connections, but couldn't reproduce the error...
It seems you got [01/20] patch error = no playback, no capture. This means has_playback/capture both flags are 0.
It seems you are using soc-topology.
Is it topology specific something ?But hmm.. ?
static int
soc_get_playback_capture(...){ ... (A) if (dai_link->dynamic || dai_link->no_pcm) { ... if (dai_link->dpcm_playback) { ... (B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) { ... } ... } if (dai_link->dpcm_capture) { ... (B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) { ... } } ... } }
Quoted 3 lines
It checks CPU (B) when
no_pcm(A) on original.
But I think "no_pcm- CPU" is dummy DAI -> above check is no meaning. After the patch, it checks both CPU/Codec.
no_pcm means that we are describing Back End, if you check any file in sound/soc/intel/avs/boards, they set link->no_pcm to 1 - those files describe card and BE (codec) configuration. Topology in case of our driver describe Front Ends (what is visible when you do "aplay -l"), as well as DSP path. Topology sets link->dynamic to 1 in soc_tplg_fe_link_create(). Do note that card and topology are loaded separately hence the "card binding deferred" message in dmesg above.
Quoted 2 lines
I wonder is your Codec which is connected to
no_pcmDAI valid ?
I'm not sure what do you mean, if it is valid? It works fine before this patch ;)
Re: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
Hi Amadeusz
Quoted 25 lines
Quoted 25 lines
static int
soc_get_playback_capture(...){ ... (A) if (dai_link->dynamic || dai_link->no_pcm) { ... if (dai_link->dpcm_playback) { ... (B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) { ... } ... } if (dai_link->dpcm_capture) { ... (B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) { ... } } ... } }It checks CPU (B) when
no_pcm(A) on original.
But I think "no_pcm- CPU" is dummy DAI -> above check is no meaning. After the patch, it checks both CPU/Codec.
(snip)
Quoted 4 lines
Quoted 1 line
I wonder is your Codec which is connected to
no_pcmDAI valid ?I'm not sure what do you mean, if it is valid? It works fine before this patch ;)
Ah, sorry, let me explain detail.
static int soc_get_playback_capture(...)
{
...
(A) if (dai_link->dynamic || dai_link->no_pcm) {
int stream;
if (dai_link->dpcm_playback) {
stream = SNDRV_PCM_STREAM_PLAYBACK;(B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
(C) if (snd_soc_dai_stream_valid(cpu_dai, stream)) {
has_playback = 1;
break;
}
}
...
}Before appling the patch, in DPCM case (A), it checks CPU valid only (B)/(C). In many case, DPCM is like this
dynamic no_pcm
[CPU/dummy-Codec] - [dummy-CPU/Codec]
I noticed that before the patch, it checks dummy DAI only for no_pcm case. But after appling the patch, it will check both CPU and Codec valid (X)/(Y)/(Z).
I think this was changed after patch.
So, my question was what happen for snd_soc_dai_stream_valid() on your Codec.
# I notcied that avs_create_dai_links() is not using dummy CPU on no_pcm case...
static int soc_get_playback_capture(...)
{
...(X) for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
(Y) codec_dai = asoc_rtd_to_codec(rtd, i); /* get paired codec */
(Z) if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
(Z) snd_soc_dai_stream_valid(cpu_dai, cpu_playback))
has_playback = 1; (Z) if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && (Z) snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) has_capture = 1; } ... }
Thank you for your help !!
Best regards
---
Kuninori Morimoto
Re: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
Quoted 86 lines · Kuninori Morimoto
Hi Amadeusz
Quoted 25 lines
Quoted 25 lines
static int
soc_get_playback_capture(...){ ... (A) if (dai_link->dynamic || dai_link->no_pcm) { ... if (dai_link->dpcm_playback) { ... (B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) { ... } ... } if (dai_link->dpcm_capture) { ... (B) for_each_rtd_cpu_dais(rtd, i, cpu_dai) { ... } } ... } }It checks CPU (B) when
no_pcm(A) on original.
But I think "no_pcm- CPU" is dummy DAI -> above check is no meaning. After the patch, it checks both CPU/Codec.(snip)
Quoted 4 lines
Quoted 1 line
I wonder is your Codec which is connected to
no_pcmDAI valid ?I'm not sure what do you mean, if it is valid? It works fine before this patch ;)
Ah, sorry, let me explain detail.
static int soc_get_playback_capture(...) { ... (A) if (dai_link->dynamic || dai_link->no_pcm) { int stream; if (dai_link->dpcm_playback) { stream = SNDRV_PCM_STREAM_PLAYBACK;(B)
for_each_rtd_cpu_dais(rtd, i, cpu_dai){(C) if (snd_soc_dai_stream_valid(cpu_dai, stream)) { has_playback = 1; break; } } ... }Before appling the patch, in DPCM case (A), it checks CPU valid only (B)/(C). In many case, DPCM is like this
dynamic
no_pcm
[CPU/dummy-Codec] - [dummy-CPU/Codec]I noticed that before the patch, it checks dummy DAI only for
no_pcmcase. But after appling the patch, it will check both CPU and Codec valid (X)/(Y)/(Z).I think this was changed after patch.
So, my question was what happen forsnd_soc_dai_stream_valid()on your Codec.# I notcied that
avs_create_dai_links()is not using dummy CPU onno_pcmcase...static int soc_get_playback_capture(...) { ...(X)
for_each_rtd_cpu_dais(rtd, i, cpu_dai){
(Y)codec_dai=asoc_rtd_to_codec(rtd, i); /* get paired codec */(Z) if (
snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK)&&
(Z)snd_soc_dai_stream_valid(cpu_dai, cpu_playback))has_playback = 1; (Z) if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && (Z) snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) has_capture = 1; } ... }
Quoted 2 lines
Thank you for your help !!
Hi,
sorry for small delay, I've debugged the issue. Seems like one less critical problem is in ASoC HDA codec, which blocks HDA and HDMI probing altogether in our driver, something like this should fix this:
commit ed93e4fbc045b8da7906484a9c88e6b53864949b (HEAD)
Author: Amadeusz Sławiński <[email protected]> Date: Wed May 24 20:54:44 2023 +0200
ASoC: codecs: hda: Fix probe codec definition
In order to properly bind snd_soc_dai_driver its snd_soc_pcm_stream
need
to provide channels_min value, otherwise ASoC framework may think that stream is improper.
sound/soc/codecs/hda.c +2 -0
@@ -341,6 +341,8 @@ static const struct snd_soc_dapm_widget hda_dapm_widgets[] = {static struct snd_soc_dai_driver card_binder_dai = { .id =-1 , .name ="codec-probing-DAI" , + .capture.channels_min =1 , + .playback.channels_min =1 , };static int hda_hdev_attach (struct hdac_device *hdev)
With the above fixed, there is issue with how HDMI is being initialized and I consider it a blocker. So it needs to be fixed first before this patchset can be merged. I did simple patch like:
sound/pci/hda/patch_hdmi.c +1 -0
@@ -2317,6 +2317,7 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)if (spec->pcm_used >=ARRAY_SIZE (spec->pcm_rec))break ;/* other pstr fields are set in open */ + pstr->channels_min =1 ; }return 0 ;
and it works for testing purposes, but as commented in code, those fields are initialized later (in hdmi_pcm_open()), which apparently in case of ASoC binding is too late. Likely those assignments need to be moved earlier.
Another thing that should probably be done is some kind of look through ASoC codec files to make sure that they all define channels_min properly, otherwise there may be more unexpected failures.
Thanks,
Amadeusz
Re: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
Hi Amadeusz
Cc Mark
Thank you for debuging/checking.
Quoted 3 lines
Quoted 3 lines
I noticed that before the patch, it checks dummy DAI only for
no_pcmcase. But after appling the patch, it will check both CPU and Codec valid (X)/(Y)/(Z).
(snip)
Quoted 3 lines
sorry for small delay, I've debugged the issue. Seems like one less critical problem is in ASoC HDA codec, which blocks HDA and HDMI probing altogether in our driver, something like this should fix this:
(snip)
Quoted 8 lines
sound/soc/codecs/hda.c +2
-0@@ -341,6 +341,8 @@ static const struct snd_soc_dapm_widget hda_dapm_widgets[] = {static struct snd_soc_dai_driver card_binder_dai = { .id =-1 , .name ="codec-probing-DAI" , + .capture.channels_min =1 , + .playback.channels_min =1 , };
(snip)
Quoted 8 lines
and it works for testing purposes, but as commented in code, those fields are initialized later (in
hdmi_pcm_open()), which apparently in case of ASoC binding is too late. Likely those assignments need to be moved earlier.Another thing that should probably be done is some kind of look through ASoC codec files to make sure that they all define
channels_minproperly, otherwise there may be more unexpected failures.
Hmm...
Quoted 1 line
From logic point of view, I think we need to check all validation.
But from compatible point of view, we want to skip validation check for BE Codec...
Especially, quick hack solution (= adding channels_min in many place) might case other bug I guess.
OK, let's skip BE Codec in v2 for now.
Thank you for your help !!
Best regards
---
Kuninori Morimoto
PATCH 9/20 ASoC: amd: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++++---------- sound/soc/amd/acp-es8336.c | 2 -- sound/soc/amd/acp/acp-mach-common.c | 20 ++++++-------------- sound/soc/amd/acp3x-rt5682-max9836.c | 6 ++---- sound/soc/amd/vangogh/acp5x-mach.c | 3 --- 5 files changed, 18 insertions(+), 33 deletions(-)
sound/soc/amd/acp-da7219-max98357a.c +10 -10
@@ -523,7 +523,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_da7219_init, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_da7219_play_ops, SND_SOC_DAILINK_REG(designware1, dlgs, platform),
@@ -533,7 +533,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_da7219_cap_ops, SND_SOC_DAILINK_REG(designware2, dlgs, platform),
@@ -543,7 +543,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "HiFi Playback", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -554,7 +554,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -565,7 +565,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform),
@@ -579,7 +579,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_rt5682_init, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_play_ops, SND_SOC_DAILINK_REG(designware1, rt5682, platform),
@@ -589,7 +589,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_cap_ops, SND_SOC_DAILINK_REG(designware2, rt5682, platform),
@@ -599,7 +599,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "HiFi Playback", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -610,7 +610,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -621,7 +621,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform),
sound/soc/amd/acp-es8336.c +0 -2
@@ -150,8 +150,6 @@ static struct snd_soc_dai_link st_dai_es8336[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .stop_dma_first = 1, - .dpcm_capture = 1, - .dpcm_playback = 1, .init = st_es8336_init, .ops = &st_es8336_ops, SND_SOC_DAILINK_REG(designware1, codec, platform),
sound/soc/amd/acp/acp-mach-common.c +6 -14
@@ -899,8 +899,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_sp); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->hs_codec_id) {
@@ -930,8 +928,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_hs); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->hs_codec_id) {
@@ -961,7 +957,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_sp_virtual); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; + links[i].playback_only =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->amp_codec_id) {
@@ -993,7 +989,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; + links[i].playback_only =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->amp_codec_id) {
@@ -1027,7 +1023,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_dmic); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_capture =1 ; + links[i].capture_only =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ; }
@@ -1065,8 +1061,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (i2s_sp); links[i].platforms = platform_component; links[i].num_platforms =ARRAY_SIZE (platform_component); - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ;if (!drv_data->hs_codec_id) {/* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc;
@@ -1099,8 +1093,6 @@ 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 ;if (!drv_data->hs_codec_id) {/* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc;
@@ -1128,7 +1120,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (i2s_sp); links[i].platforms = platform_component; links[i].num_platforms =ARRAY_SIZE (platform_component); - links[i].dpcm_playback =1 ; + links[i].playback_only =1 ;if (!drv_data->amp_codec_id) {/* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc;
@@ -1163,7 +1155,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_only =1 ;if (!drv_data->amp_codec_id) {/* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc;
@@ -1207,7 +1199,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_only =1 ; } card->dai_link = links;
sound/soc/amd/acp3x-rt5682-max9836.c +2 -4
@@ -304,8 +304,6 @@ static struct snd_soc_dai_link acp3x_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = acp3x_5682_init, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp3x_5682_ops, SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform), },
@@ -314,7 +312,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "HiFi Playback", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, .ops = &acp3x_max_play_ops, .cpus = acp3x_bt, .num_cpus = ARRAY_SIZE(acp3x_bt),
@@ -326,7 +324,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "Capture DMIC0", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_capture = 1, + .capture_only = 1, .ops = &acp3x_ec_cap0_ops, SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform), },
sound/soc/amd/vangogh/acp5x-mach.c +0 -3
@@ -273,8 +273,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
@@ -285,7 +283,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform),
Signature · 1 line
2.25.1
PATCH 10/20 ASoC: fsl: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/fsl/fsl-asoc-card.c | 16 ++++++---------- sound/soc/fsl/imx-audmix.c | 6 ++---- sound/soc/fsl/imx-card.c | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-)
sound/soc/fsl/fsl-asoc-card.c +6 -10
@@ -311,8 +311,6 @@ 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, .dynamic =1 , SND_SOC_DAILINK_REG(hifi_fe), },
@@ -321,8 +319,6 @@ 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, .no_pcm =1 , SND_SOC_DAILINK_REG(hifi_be), },
@@ -633,8 +629,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 ].playback_only =1 ; + priv->dai_link[2 ].playback_only =1 ; 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;
@@ -660,15 +656,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 ].playback_only =1 ; + priv->dai_link[2 ].playback_only =1 ; 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 ].playback_only =1 ; + priv->dai_link[2 ].playback_only =1 ; priv->cpu_priv.slot_width =32 ; priv->card.dapm_routes = audio_map_tx; priv->card.num_dapm_routes =ARRAY_SIZE (audio_map_tx);
sound/soc/fsl/imx-audmix.c +2 -4
@@ -255,10 +255,10 @@ 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].ignore_pmdown_time =1 ; priv->dai[i].ops = &imx_audmix_fe_ops; +if (i) + priv->dai[i].playback_only =1 ;/* Add AUDMIX Backend */ be_name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
@@ -278,8 +278,6 @@ 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].ignore_pmdown_time =1 ; priv->dai[num_dai + i].ops = &imx_audmix_be_ops;
sound/soc/fsl/imx-card.c +2 -2
@@ -826,8 +826,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_only = link_be->playback_only; + link->capture_only = link_be->capture_only; } } }
Signature · 1 line
2.25.1
PATCH 11/20 ASoC: sof: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/sof/nocodec.c | 4 ---- 1 file changed, 4 deletions(-)
sound/soc/sof/nocodec.c +0 -4
@@ -55,10 +55,6 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].no_pcm =1 ; 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 ; -if (drv[i].capture.channels_min) - links[i].dpcm_capture =1 ; links[i].be_hw_params_fixup = sof_pcm_dai_link_fixup; }
Signature · 1 line
2.25.1
PATCH 12/20 ASoC: meson: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/meson/axg-card.c | 8 ++++---- sound/soc/meson/meson-card-utils.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/meson/axg-card.c +4 -4
@@ -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_only =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->capture_only =1 ;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->playback_only =1 ;/* ... 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->capture_only) { ret =axg_card_add_tdm_loopback (card, index);if (ret)return ret;
sound/soc/meson/meson-card-utils.c +2 -2
@@ -192,9 +192,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_only =1 ;else - link->dpcm_capture =1 ; + link->capture_only =1 ;return meson_card_set_link_name (card, link, node,"fe" ); }
Signature · 1 line
2.25.1
PATCH 13/20 ASoC: Intel: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
NOTE
Some Intel code was complex. Please check this patch deeply.
--- sound/soc/intel/avs/boards/da7219.c | 2 - sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/hdaudio.c | 4 -- sound/soc/intel/avs/boards/i2s_test.c | 2 - sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 - sound/soc/intel/avs/boards/max98927.c | 2 - sound/soc/intel/avs/boards/nau8825.c | 2 - sound/soc/intel/avs/boards/rt274.c | 2 - sound/soc/intel/avs/boards/rt286.c | 2 - sound/soc/intel/avs/boards/rt298.c | 2 - sound/soc/intel/avs/boards/rt5682.c | 2 - sound/soc/intel/avs/boards/ssm4567.c | 2 - sound/soc/intel/boards/bdw-rt5650.c | 4 -- sound/soc/intel/boards/bdw-rt5677.c | 4 -- sound/soc/intel/boards/bdw_rt286.c | 10 ++-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 32 ++++++----- sound/soc/intel/boards/bxt_rt298.c | 26 +++++---- sound/soc/intel/boards/bytcht_cx2072x.c | 6 +-- sound/soc/intel/boards/bytcht_da7213.c | 6 +-- sound/soc/intel/boards/bytcht_es8316.c | 6 +-- sound/soc/intel/boards/bytcht_nocodec.c | 6 +-- sound/soc/intel/boards/bytcr_rt5640.c | 6 +-- sound/soc/intel/boards/bytcr_rt5651.c | 6 +-- sound/soc/intel/boards/bytcr_wm5102.c | 6 +-- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +-- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +-- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +-- sound/soc/intel/boards/cml_rt1011_rt5682.c | 14 ++--- sound/soc/intel/boards/ehl_rt5660.c | 14 +++-- sound/soc/intel/boards/glk_rt5682_max98357a.c | 30 +++++------ sound/soc/intel/boards/hsw_rt5640.c | 10 ++-- sound/soc/intel/boards/kbl_da7219_max98357a.c | 26 +++++---- sound/soc/intel/boards/kbl_da7219_max98927.c | 54 +++++++++---------- sound/soc/intel/boards/kbl_rt5660.c | 18 +++---- sound/soc/intel/boards/kbl_rt5663_max98927.c | 44 +++++++-------- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 22 ++++---- sound/soc/intel/boards/skl_hda_dsp_common.c | 14 ++--- .../soc/intel/boards/skl_nau88l25_max98357a.c | 26 +++++---- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 26 ++++----- sound/soc/intel/boards/skl_rt286.c | 26 +++++---- sound/soc/intel/boards/sof_cs42l42.c | 12 +---- sound/soc/intel/boards/sof_da7219_max98373.c | 16 +++--- sound/soc/intel/boards/sof_es8336.c | 8 ++- sound/soc/intel/boards/sof_nau8825.c | 12 +---- sound/soc/intel/boards/sof_pcm512x.c | 8 +-- sound/soc/intel/boards/sof_rt5682.c | 12 +---- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_ssp_amp.c | 11 ++-- sound/soc/intel/boards/sof_wm8804.c | 2 - 51 files changed, 209 insertions(+), 372 deletions(-)
sound/soc/intel/avs/boards/da7219.c +0 -2
@@ -173,8 +173,6 @@ 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 ; *dai_link = dl;
sound/soc/intel/avs/boards/dmic.c +2 -2
@@ -22,7 +22,7 @@ static struct snd_soc_dai_link card_dai_links[] = { { .name = "DMIC", .id = 0, - .dpcm_capture = 1, + .capture_only = 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_only = 1, .nonatomic = 1, .no_pcm = 1, .ignore_suspend = 1,
sound/soc/intel/avs/boards/hdaudio.c +0 -4
@@ -39,8 +39,6 @@ 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].platforms = platform; dl[i].num_platforms =1 ; dl[i].ignore_pmdown_time =1 ;
@@ -222,8 +220,6 @@ static struct snd_soc_dai_link probing_link = { .id = -1, .nonatomic = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .cpus = dummy, .num_cpus = ARRAY_SIZE(dummy), .init = avs_probing_link_init,
sound/soc/intel/avs/boards/i2s_test.c +0 -2
@@ -43,8 +43,6 @@ 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 ; *dai_link = dl;
sound/soc/intel/avs/boards/max98357a.c +1 -1
@@ -79,7 +79,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_only =1 ; *dai_link = dl;
sound/soc/intel/avs/boards/max98373.c +0 -2
@@ -131,8 +131,6 @@ 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->ignore_pmdown_time =1 ; dl->ops = &avs_max98373_ops;
sound/soc/intel/avs/boards/max98927.c +0 -2
@@ -128,8 +128,6 @@ 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->ignore_pmdown_time =1 ; dl->ops = &avs_max98927_ops;
sound/soc/intel/avs/boards/nau8825.c +0 -2
@@ -207,8 +207,6 @@ 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 ; *dai_link = dl;
sound/soc/intel/avs/boards/rt274.c +0 -2
@@ -180,8 +180,6 @@ 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 ; *dai_link = dl;
sound/soc/intel/avs/boards/rt286.c +0 -2
@@ -150,8 +150,6 @@ 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 ; *dai_link = dl;
sound/soc/intel/avs/boards/rt298.c +0 -2
@@ -170,8 +170,6 @@ 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 ; *dai_link = dl;
sound/soc/intel/avs/boards/rt5682.c +0 -2
@@ -226,8 +226,6 @@ 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 ; *dai_link = dl;
sound/soc/intel/avs/boards/ssm4567.c +0 -2
@@ -120,8 +120,6 @@ 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->ignore_pmdown_time =1 ; *dai_link = dl;
sound/soc/intel/boards/bdw-rt5650.c +0 -4
@@ -239,8 +239,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { SND_SOC_DPCM_TRIGGER_POST,SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(fe, dummy, platform), },
@@ -256,8 +254,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broadwell_ssp0_fixup, .ops = &bdw_rt5650_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = bdw_rt5650_init, SND_SOC_DAILINK_REG(ssp0_port, be, platform), },
sound/soc/intel/boards/bdw-rt5677.c +0 -4
@@ -329,8 +329,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { SND_SOC_DPCM_TRIGGER_POST,SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_capture = 1, - .dpcm_playback = 1, .ops = &bdw_rt5677_fe_ops, SND_SOC_DAILINK_REG(fe, dummy, platform), },
@@ -356,8 +354,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broadwell_ssp0_fixup, .ops = &bdw_rt5677_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = bdw_rt5677_init, .exit = bdw_rt5677_exit, SND_SOC_DAILINK_REG(ssp0_port, be, platform),
sound/soc/intel/boards/bdw_rt286.c +3 -7
@@ -133,8 +133,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, {
@@ -143,7 +141,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, {
@@ -152,7 +150,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, {
@@ -161,7 +159,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), },/* Back End DAI links */
@@ -177,8 +175,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = codec_link_hw_params_fixup, .ops = &codec_link_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, };
sound/soc/intel/boards/bxt_da7219_max98357a.c +15 -17
@@ -497,7 +497,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_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -509,7 +509,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_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -520,7 +520,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_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system2, dummy, platform), },
@@ -529,7 +529,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio Reference cap", .stream_name = "Refcap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_refcap_ops,
@@ -540,7 +540,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_dmic_ops,
@@ -550,7 +550,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -560,7 +560,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -570,7 +570,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -587,7 +587,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_only =1 , SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, {
@@ -600,8 +600,6 @@ 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 , SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, {
@@ -609,7 +607,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_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), },
@@ -617,7 +615,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp1", .id = 3, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), },
@@ -625,7 +623,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp2", .id = 4, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -633,7 +631,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp3", .id = 5, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
@@ -641,7 +639,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "dmic16k", .id = 6, .be_hw_params_fixup = broxton_dmic_fixup, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), },
@@ -824,7 +822,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].playback_only =0 ; } }/* DIALOG_CODEC is connected to SSP0 */
sound/soc/intel/boards/bxt_rt298.c +12 -14
@@ -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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -472,8 +472,6 @@ 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 , SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, {
@@ -481,7 +479,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_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), },
@@ -490,7 +488,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_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), },
@@ -498,7 +496,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp1", .id = 3, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), },
@@ -506,7 +504,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp2", .id = 4, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -514,7 +512,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp3", .id = 5, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
sound/soc/intel/boards/bytcht_cx2072x.c +1 -5
@@ -175,8 +175,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -185,7 +183,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -198,8 +196,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = byt_cht_cx2072x_init, .be_hw_params_fixup = byt_cht_cx2072x_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp2, cx2072x, platform), }, };
sound/soc/intel/boards/bytcht_da7213.c +1 -5
@@ -174,8 +174,6 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -184,7 +182,7 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -197,8 +195,6 @@ static struct snd_soc_dai_link dailink[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), },
sound/soc/intel/boards/bytcht_es8316.c +1 -5
@@ -314,8 +314,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -325,7 +323,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -338,8 +336,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_cht_es8316_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_cht_es8316_init, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), },
sound/soc/intel/boards/bytcht_nocodec.c +1 -5
@@ -119,8 +119,6 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -130,7 +128,7 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -144,8 +142,6 @@ static struct snd_soc_dai_link dais[] = { | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = codec_fixup, .ignore_suspend = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp2_port, dummy, platform), }, };
sound/soc/intel/boards/bytcr_rt5640.c +1 -5
@@ -1505,8 +1505,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -1515,7 +1513,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -1527,8 +1525,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_rt5640_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_rt5640_init, .exit = byt_rt5640_exit, .ops = &byt_rt5640_be_ssp2_ops,
sound/soc/intel/boards/bytcr_rt5651.c +1 -5
@@ -770,8 +770,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -780,7 +778,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -793,8 +791,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_rt5651_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_rt5651_init, .ops = &byt_rt5651_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
sound/soc/intel/boards/bytcr_wm5102.c +1 -5
@@ -320,8 +320,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform),
@@ -331,7 +329,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -351,8 +349,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_wm5102_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_wm5102_init, SND_SOC_DAILINK_REG(ssp0_port, ssp0_codec, platform), },
sound/soc/intel/boards/cht_bsw_max98090_ti.c +1 -5
@@ -351,8 +351,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -361,7 +359,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -374,8 +372,6 @@ static struct snd_soc_dai_link cht_dailink[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), },
sound/soc/intel/boards/cht_bsw_nau8824.c +1 -5
@@ -193,8 +193,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -203,7 +201,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -217,8 +215,6 @@ static struct snd_soc_dai_link cht_dailink[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), },
sound/soc/intel/boards/cht_bsw_rt5645.c +1 -5
@@ -449,8 +449,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -459,7 +457,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -471,8 +469,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .no_pcm = 1, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), },
sound/soc/intel/boards/cht_bsw_rt5672.c +1 -5
@@ -354,8 +354,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), },
@@ -364,7 +362,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), },
@@ -377,8 +375,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .no_pcm = 1, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), },
sound/soc/intel/boards/cml_rt1011_rt5682.c +5 -9
@@ -443,8 +443,6 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .exit = cml_rt5682_codec_exit, .ignore_pmdown_time = 1, .ops = &cml_rt5682_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), },
@@ -452,7 +450,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "dmic01", .id = 1, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), },
@@ -460,7 +458,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "dmic16k", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), },
@@ -468,7 +466,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "iDisp1", .id = 3, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), },
@@ -476,7 +474,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "iDisp2", .id = 4, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -484,7 +482,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "iDisp3", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
@@ -496,8 +494,6 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = {*/ .name = "SSP1-Codec", .id = 6, - .dpcm_playback = 1, - .dpcm_capture = 1, /* Capture stream provides Feedback */ .no_pcm = 1, .init = cml_rt1011_spk_init, .ops = &cml_rt1011_ops,
sound/soc/intel/boards/ehl_rt5660.c +6 -8
@@ -178,8 +178,6 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "SSP0-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &rt5660_ops, SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform), },
@@ -187,7 +185,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic48k", .id = 1, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), },
@@ -195,7 +193,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic16k", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), },
@@ -203,7 +201,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp1", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), },
@@ -211,7 +209,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp2", .id = 6, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -219,7 +217,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp3", .id = 7, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
@@ -227,7 +225,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp4", .id = 8, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform), },
sound/soc/intel/boards/glk_rt5682_max98357a.c +14 -16
@@ -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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only =1 , SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, {
@@ -521,8 +521,6 @@ 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 , SND_SOC_DAILINK_REG(ssp2_pin, ssp2_codec_5682, platform), }, {
@@ -530,7 +528,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_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), },
@@ -538,7 +536,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp1", .id = 3, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), },
@@ -546,7 +544,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp2", .id = 4, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -554,7 +552,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp3", .id = 5, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
sound/soc/intel/boards/hsw_rt5640.c +3 -7
@@ -85,8 +85,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, {
@@ -95,7 +93,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, {
@@ -104,7 +102,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, {
@@ -113,7 +111,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), },/* Back End DAI links */
@@ -127,8 +125,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = codec_link_hw_params_fixup, .ops = &codec_link_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, };
sound/soc/intel/boards/kbl_da7219_max98357a.c +12 -14
@@ -453,7 +453,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_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -464,7 +464,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_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -472,7 +472,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_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops,
@@ -482,7 +482,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops,
@@ -491,7 +491,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_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -502,7 +502,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_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -515,7 +515,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_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -533,7 +533,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_only =1 , SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, {
@@ -546,8 +546,6 @@ 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 , SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, {
@@ -555,14 +553,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_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name ="iDisp1" , .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -571,7 +569,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -579,7 +577,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp3", .id = 5, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
sound/soc/intel/boards/kbl_da7219_max98927.c +24 -30
216 lines not on this page · raw message
sound/soc/intel/boards/kbl_rt5660.c +8 -10
@@ -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_only = 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_only = 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_only = 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_only = 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_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -440,14 +440,12 @@ 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 , SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { .name ="iDisp1" , .id = 1, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -456,7 +454,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .name = "iDisp2", .id = 2, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -464,7 +462,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .name = "iDisp3", .id = 3, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm =1 , SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
sound/soc/intel/boards/kbl_rt5663_max98927.c +20 -24
175 lines not on this page · raw message
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +9 -13
@@ -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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -655,8 +655,6 @@ 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, .ops = &kabylake_ssp0_ops, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), },
@@ -670,14 +668,12 @@ 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, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -686,7 +682,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
sound/soc/intel/boards/skl_hda_dsp_common.c +5 -9
@@ -84,51 +84,47 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = { { .name = "iDisp1", .id = 1, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_cpu, idisp1_codec, platform), }, { .name = "iDisp2", .id = 2, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_cpu, idisp2_codec, platform), }, { .name = "iDisp3", .id = 3, - .dpcm_playback = 1, + .playback_only = 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, .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, .no_pcm = 1, SND_SOC_DAILINK_REG(digital_cpu, digital_codec, platform), }, { .name = "dmic01", .id = 6, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "dmic16k", .id = 7, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), },
sound/soc/intel/boards/skl_nau88l25_max98357a.c +12 -14
@@ -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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, {
@@ -568,8 +568,6 @@ 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, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, {
@@ -577,14 +575,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_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = skylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -593,7 +591,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp2", .id = 4, .init = skylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -601,7 +599,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp3", .id = 5, .init = skylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +11 -15
@@ -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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -594,8 +594,6 @@ 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, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, {
@@ -609,8 +607,6 @@ 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, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, {
@@ -618,14 +614,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_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = skylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
@@ -634,7 +630,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp2", .id = 4, .init = skylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -642,7 +638,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp3", .id = 5, .init = skylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
sound/soc/intel/boards/skl_rt286.c +12 -14
@@ -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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 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_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -438,8 +438,6 @@ 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, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, {
@@ -447,7 +445,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_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), },
@@ -455,7 +453,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp1", .id = 2, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), },
@@ -463,7 +461,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp2", .id = 3, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -471,7 +469,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp3", .id = 4, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
sound/soc/intel/boards/sof_cs42l42.c +2 -10
@@ -328,10 +328,6 @@ static int create_spk_amp_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); - links[*id].dpcm_playback = 1; - /* firmware-generated echo reference */ - links[*id].dpcm_capture = 1; - links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1;
@@ -368,8 +364,6 @@ static int create_hp_codec_dai_links(struct device *dev, links[*id].init = sof_cs42l42_init; links[*id].exit = sof_cs42l42_exit; links[*id].ops = &sof_cs42l42_ops; - links[*id].dpcm_playback = 1; - links[*id].dpcm_capture = 1; links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1;
@@ -420,7 +414,7 @@ static int create_dmic_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); links[*id].ignore_suspend = 1; - links[*id].dpcm_capture = 1; + links[*id].capture_only = 1; links[*id].no_pcm = 1; (*id)++;
@@ -476,7 +470,7 @@ static int create_hdmi_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); links[*id].init = sof_hdmi_init; - links[*id].dpcm_playback = 1; + links[*id].playback_only = 1; links[*id].no_pcm = 1; (*id)++;
@@ -508,8 +502,6 @@ static int create_bt_offload_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); - links[*id].dpcm_playback = 1; - links[*id].dpcm_capture = 1; links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1;
sound/soc/intel/boards/sof_da7219_max98373.c +6 -10
@@ -316,8 +316,6 @@ static struct snd_soc_dai_link dais[] = { .id = 0, .ignore_pmdown_time = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, /* IV feedback */ .ops = &ssp1_ops, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_amps, platform), },
@@ -327,15 +325,13 @@ static struct snd_soc_dai_link dais[] = { .no_pcm = 1, .init = da7219_codec_init, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { .name = "dmic01", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), },
@@ -343,7 +339,7 @@ static struct snd_soc_dai_link dais[] = { .name = "iDisp1", .id = 3, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), },
@@ -351,7 +347,7 @@ static struct snd_soc_dai_link dais[] = { .name = "iDisp2", .id = 4, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), },
@@ -359,7 +355,7 @@ static struct snd_soc_dai_link dais[] = { .name = "iDisp3", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), },
@@ -367,7 +363,7 @@ static struct snd_soc_dai_link dais[] = { .name = "dmic16k", .id = 6, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), }
@@ -422,7 +418,7 @@ static int audio_probe(struct platform_device *pdev) .name = "SSP1-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_pmdown_time = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_m98360a, platform) }; }
sound/soc/intel/boards/sof_es8336.c +3 -5
@@ -455,8 +455,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].exit = sof_es8316_exit; links[id].ops = &sof_es8336_ops; links[id].nonatomic = true; - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1;
@@ -496,7 +494,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++;
@@ -539,7 +537,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++;
@@ -569,7 +567,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; id++;
sound/soc/intel/boards/sof_nau8825.c +2 -10
@@ -378,8 +378,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].init = sof_nau8825_codec_init; links[id].exit = sof_nau8825_codec_exit; links[id].ops = &sof_nau8825_ops; - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1;
@@ -416,7 +414,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; }
@@ -457,7 +455,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; }
@@ -496,10 +494,6 @@ 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].dpcm_playback = 1; - /* feedback stream or firmware-generated echo reference */ - links[id].dpcm_capture = 1; - links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1;
@@ -529,8 +523,6 @@ 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_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; }
sound/soc/intel/boards/sof_pcm512x.c +4 -4
@@ -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_only = 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].playback_only = 0; 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_only = 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_only = 1; links[id].no_pcm = 1; id++; }
sound/soc/intel/boards/sof_rt5682.c +2 -10
@@ -647,8 +647,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].init = sof_rt5682_codec_init; links[id].exit = sof_rt5682_codec_exit; links[id].ops = &sof_rt5682_ops; - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1;
@@ -701,7 +699,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; }
@@ -746,7 +744,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; }
@@ -795,10 +793,6 @@ 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].dpcm_playback = 1; - /* feedback stream or firmware-generated echo reference */ - links[id].dpcm_capture = 1; - links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1;
@@ -837,8 +831,6 @@ 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_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; }
sound/soc/intel/boards/sof_sdw.c +2 -2
@@ -815,8 +815,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_only = !capture; + dai_links->capture_only = !playback; dai_links->init = init; dai_links->ops = ops; }
sound/soc/intel/boards/sof_ssp_amp.c +3 -8
@@ -230,7 +230,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; id++;
@@ -250,9 +250,6 @@ 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].dpcm_playback = 1; - /* feedback from amplifier or firmware-generated echo reference */ - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1;
@@ -285,7 +282,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; }
@@ -332,7 +329,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; }
@@ -356,8 +353,6 @@ 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_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; id++;
sound/soc/intel/boards/sof_wm8804.c +0 -2
@@ -167,8 +167,6 @@ static struct snd_soc_dai_link dailink[] = { .name = "SSP5-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &sof_wm8804_ops, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), },
Signature · 1 line
2.25.1
Re: [PATCH 13/20] ASoC: Intel: replace dpcm_playback/capture to playback/capture_only
Quoted 53 lines · Kuninori Morimoto
soc_get_playback_capture()is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.NOTE
Some Intel code was complex. Please check this patch deeply.Signed-off-by Kuninori Morimoto <[email protected]>--- sound/soc/intel/avs/boards/da7219.c | 2 - sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/hdaudio.c | 4 -- sound/soc/intel/avs/boards/i2s_test.c | 2 - sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 - sound/soc/intel/avs/boards/max98927.c | 2 - sound/soc/intel/avs/boards/nau8825.c | 2 - sound/soc/intel/avs/boards/rt274.c | 2 - sound/soc/intel/avs/boards/rt286.c | 2 - sound/soc/intel/avs/boards/rt298.c | 2 - sound/soc/intel/avs/boards/rt5682.c | 2 - sound/soc/intel/avs/boards/ssm4567.c | 2 - sound/soc/intel/boards/bdw-rt5650.c | 4 -- sound/soc/intel/boards/bdw-rt5677.c | 4 -- sound/soc/intel/boards/bdw_rt286.c | 10 ++-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 32 ++++++----- sound/soc/intel/boards/bxt_rt298.c | 26 +++++---- sound/soc/intel/boards/bytcht_cx2072x.c | 6 +-- sound/soc/intel/boards/bytcht_da7213.c | 6 +-- sound/soc/intel/boards/bytcht_es8316.c | 6 +-- sound/soc/intel/boards/bytcht_nocodec.c | 6 +-- sound/soc/intel/boards/bytcr_rt5640.c | 6 +-- sound/soc/intel/boards/bytcr_rt5651.c | 6 +-- sound/soc/intel/boards/bytcr_wm5102.c | 6 +-- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +-- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +-- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +-- sound/soc/intel/boards/cml_rt1011_rt5682.c | 14 ++--- sound/soc/intel/boards/ehl_rt5660.c | 14 +++-- sound/soc/intel/boards/glk_rt5682_max98357a.c | 30 +++++------ sound/soc/intel/boards/hsw_rt5640.c | 10 ++-- sound/soc/intel/boards/kbl_da7219_max98357a.c | 26 +++++---- sound/soc/intel/boards/kbl_da7219_max98927.c | 54 +++++++++---------- sound/soc/intel/boards/kbl_rt5660.c | 18 +++---- sound/soc/intel/boards/kbl_rt5663_max98927.c | 44 +++++++-------- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 22 ++++---- sound/soc/intel/boards/skl_hda_dsp_common.c | 14 ++--- .../soc/intel/boards/skl_nau88l25_max98357a.c | 26 +++++---- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 26 ++++----- sound/soc/intel/boards/skl_rt286.c | 26 +++++---- sound/soc/intel/boards/sof_cs42l42.c | 12 +---- sound/soc/intel/boards/sof_da7219_max98373.c | 16 +++---
Quoted 9 lines
sound/soc/intel/boards/sof_es8336.c | 8 ++- sound/soc/intel/boards/sof_nau8825.c | 12 +---- sound/soc/intel/boards/sof_pcm512x.c | 8 +-- sound/soc/intel/boards/sof_rt5682.c | 12 +---- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_ssp_amp.c | 11 ++-- sound/soc/intel/boards/sof_wm8804.c | 2 - 51 files changed, 209 insertions(+), 372 deletions(-)
I've looked twice at avs part and skimmed through rest of boards, overall seems good, but please split sound/soc/intel/avs/boards/ and sound/soc/intel/boards/ into two separate patches.
Re: [PATCH 13/20] ASoC: Intel: replace dpcm_playback/capture to playback/capture_only
Hi Amadeusz
Quoted 9 lines
Quoted 9 lines
soc_get_playback_capture()is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.NOTE
Some Intel code was complex. Please check this patch deeply.Signed-off-by Kuninori Morimoto <[email protected]>---
(snip)
Quoted 3 lines
I've looked twice at avs part and skimmed through rest of boards, overall seems good, but please split
sound/soc/intel/avs/boards/andsound/soc/intel/boards/into two separate patches.
Thank you for your review
Will separate in v2 patch.
Thank you for your help !!
Best regards
---
Kuninori Morimoto
PATCH 14/20 ASoC: samsung: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/samsung/odroid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/samsung/odroid.c +5 -5
@@ -173,14 +173,14 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Primary", .stream_name = "Primary", .dynamic = 1, - .dpcm_playback =1 , + .playback_only =1 , SND_SOC_DAILINK_REG(primary), }, {/* BE <-> CODECs link */ .name ="I2S Mixer" , .ops = &odroid_card_be_ops, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBS_CFS , SND_SOC_DAILINK_REG(mixer),
@@ -191,7 +191,7 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Secondary", .stream_name = "Secondary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(secondary), } };
@@ -293,8 +293,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_only =1 ; + card->dai_link[1 ].capture_only =1 ; } priv->sclk_i2s =of_clk_get_by_name (cpu_dai,"i2s_opclk1" );
Signature · 1 line
2.25.1
PATCH 15/20 ASoC: mediatek: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 20 ++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 24 ++---- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +-- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +-- .../mediatek/mt8183/mt8183-da7219-max98357.c | 34 +++----- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 34 +++----- .../mt8186/mt8186-mt6366-da7219-max98357.c | 86 +++++++------------ .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 86 +++++++------------ sound/soc/mediatek/mt8188/mt8188-mt6359.c | 48 +++++------ .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++++--------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 +++++++------ 14 files changed, 204 insertions(+), 304 deletions(-)
sound/soc/mediatek/mt2701/mt2701-cs42448.c +5 -15
@@ -222,7 +222,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_playback =1 , + .playback_only =1 , SND_SOC_DAILINK_REG(fe_multi_ch_out), }, [DAI_LINK_FE_PCM0_IN] = {
@@ -232,7 +232,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture =1 , + .capture_only =1 , SND_SOC_DAILINK_REG(fe_pcm0_in), }, [DAI_LINK_FE_PCM1_IN] = {
@@ -242,7 +242,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture =1 , + .capture_only =1 , SND_SOC_DAILINK_REG(fe_pcm1_in), }, [DAI_LINK_FE_BT_OUT] = {
@@ -251,7 +251,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_bt_out), }, [DAI_LINK_FE_BT_IN] = {
@@ -260,7 +260,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_bt_in), },/* BE */
@@ -270,8 +270,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture =1 , SND_SOC_DAILINK_REG(be_i2s0), }, [DAI_LINK_BE_I2S1] = {
@@ -280,8 +278,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture =1 , SND_SOC_DAILINK_REG(be_i2s1), }, [DAI_LINK_BE_I2S2] = {
@@ -290,8 +286,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture =1 , SND_SOC_DAILINK_REG(be_i2s2), }, [DAI_LINK_BE_I2S3] = {
@@ -300,15 +294,11 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1,SND_SOC_DAILINK_REG (be_i2s3), }, [DAI_LINK_BE_MRG_BT] = { .name ="mt2701-cs42448-MRG-BT" , .no_pcm =1 , - .dpcm_playback =1 , - .dpcm_capture =1 ,SND_SOC_DAILINK_REG (be_mrg_bt), }, };
sound/soc/mediatek/mt2701/mt2701-wm8960.c +2 -4
@@ -67,7 +67,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, {
@@ -76,7 +76,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), },/* BE */
@@ -86,8 +86,6 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_wm8960_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, };
sound/soc/mediatek/mt6797/mt6797-mt6351.c +7 -17
@@ -78,7 +78,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_1), }, {
@@ -87,7 +87,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_2), }, {
@@ -96,7 +96,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_3), }, {
@@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_1), }, {
@@ -114,7 +114,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_2), }, {
@@ -123,7 +123,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_3), }, {
@@ -132,7 +132,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono_1), }, {
@@ -141,8 +141,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), },
@@ -152,8 +150,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_speech), },
@@ -161,24 +157,18 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), },
sound/soc/mediatek/mt8173/mt8173-max98090.c +2 -4
@@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, {
@@ -113,7 +113,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), },/* Back End DAI links */
@@ -124,8 +124,6 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .ops = &mt8173_max98090_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(hifi), }, };
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +2 -4
@@ -128,7 +128,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = {
@@ -136,7 +136,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), },/* Back End DAI links */
@@ -148,8 +148,6 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5514_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, };
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +4 -6
@@ -160,7 +160,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = {
@@ -168,7 +168,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = {
@@ -176,7 +176,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), },
@@ -189,14 +189,12 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5676_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1,SND_SOC_DAILINK_REG (codec), }, [DAI_LINK_HDMI_I2S] = { .name ="HDMI BE" , .no_pcm =1 , - .dpcm_playback =1 , + .playback_only =1 ,SND_SOC_DAILINK_REG (hdmi_be), }, /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */
sound/soc/mediatek/mt8173/mt8173-rt5650.c +4 -6
@@ -199,7 +199,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = {
@@ -207,7 +207,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = {
@@ -215,7 +215,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), },/* Back End DAI links */
@@ -227,14 +227,12 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1,SND_SOC_DAILINK_REG (codec), }, [DAI_LINK_HDMI_I2S] = { .name ="HDMI BE" , .no_pcm =1 , - .dpcm_playback =1 , + .playback_only =1 , .init = mt8173_rt5650_hdmi_init,SND_SOC_DAILINK_REG (hdmi_be), },
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +14 -20
@@ -410,7 +410,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(playback1), },
@@ -420,7 +420,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), },
@@ -430,7 +430,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, {
@@ -439,7 +439,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), },
@@ -449,7 +449,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, {
@@ -458,7 +458,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(capture3), },
@@ -468,7 +468,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, {
@@ -477,38 +477,32 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* BE */ { .name ="Primary Codec" , .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name ="PCM 1" , .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name ="PCM 2" , .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name ="I2S0" , .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -517,7 +511,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -526,7 +520,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_da7219_i2s_ops,
@@ -536,13 +530,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -555,7 +549,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ignore = 1,
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +14 -20
@@ -430,7 +430,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(playback1), },
@@ -440,7 +440,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), },
@@ -450,7 +450,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, {
@@ -459,7 +459,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), },
@@ -469,7 +469,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, {
@@ -478,7 +478,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(capture3), },
@@ -488,7 +488,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, {
@@ -497,7 +497,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, {
@@ -513,31 +513,25 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s0),
@@ -545,7 +539,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -554,7 +548,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -564,13 +558,13 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, .init = &mt8183_bt_init,
@@ -582,7 +576,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_tdm_ops,
sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +32 -54
341 lines not on this page · raw message
sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +32 -54
341 lines not on this page · raw message
sound/soc/mediatek/mt8188/mt8188-mt6359.c +22 -26
192 lines not on this page · raw message
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +35 -43
312 lines not on this page · raw message
sound/soc/mediatek/mt8195/mt8195-mt6359.c +29 -31
237 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 16/20 ASoC: soc-dai.c: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/soc-dai.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-dai.c +2 -2
@@ -505,8 +505,8 @@ void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) supported[direction] = supported_cpu && supported_codec; } - dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK ]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE ]; + dai_link->playback_only = !supported[SNDRV_PCM_STREAM_CAPTURE ]; + dai_link->capture_only = !supported[SNDRV_PCM_STREAM_PLAYBACK ]; }EXPORT_SYMBOL_GPL (snd_soc_dai_link_set_capabilities);
Signature · 1 line
2.25.1
Re: [PATCH 16/20] ASoC: soc-dai.c: replace dpcm_playback/capture to playback/capture_only
Quoted 14 lines · Kuninori Morimoto
soc_get_playback_capture()is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.Signed-off-by Kuninori Morimoto <[email protected]>--- sound/soc/soc-dai.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)sound/soc/soc-dai.c +0
-0
sound/soc/soc-dai.c void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) · line 512
Quoted 10 lines
sound/soc/soc-dai.c +2
-2@@ -505,8 +505,8 @@ void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) supported[direction] = supported_cpu && supported_codec; } - dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK ]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE ]; + dai_link->playback_only = !supported[SNDRV_PCM_STREAM_CAPTURE ]; + dai_link->capture_only = !supported[SNDRV_PCM_STREAM_PLAYBACK ]; }EXPORT_SYMBOL_GPL (snd_soc_dai_link_set_capabilities);
What happens if somehow both supported[SNDRV_PCM_STREAM_CAPTURE] and supported[SNDRV_PCM_STREAM_PLAYBACK] are false, and so both dai_link->playback_only & dai_link->capture_only get set to true?
Perhaps assignment should be more like:dai_link->playback_only = supported[SNDRV_PCM_STREAM_PLAYBACK] && !supported[SNDRV_PCM_STREAM_CAPTURE]; dai_link->playback_only = supported[SNDRV_PCM_STREAM_CAPTURE] && !supported[SNDRV_PCM_STREAM_PLAYBACK];
Re: [PATCH 16/20] ASoC: soc-dai.c: replace dpcm_playback/capture to playback/capture_only
Hi Amadeusz
Quoted 11 lines
sound/soc/soc-dai.c void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) · line 511
Quoted 7 lines
sound/soc/soc-dai.c +2
-2- dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK ]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE ]; + dai_link->playback_only = !supported[SNDRV_PCM_STREAM_CAPTURE ]; + dai_link->capture_only = !supported[SNDRV_PCM_STREAM_PLAYBACK ]; }EXPORT_SYMBOL_GPL (snd_soc_dai_link_set_capabilities);What happens if somehow both supported[SNDRV_PCM_STREAM_CAPTURE] and supported[SNDRV_PCM_STREAM_PLAYBACK] are false, and so both
dai_link->playback_only&dai_link->capture_onlyget set to true?
I think it is original code issue (= both dpcm_playback/capture are false). [01/20] patch will indicate error in such case.
Quoted 5 lines
Perhaps assignment should be more like:
dai_link->playback_only= supported[SNDRV_PCM_STREAM_PLAYBACK] && !supported[SNDRV_PCM_STREAM_CAPTURE];dai_link->playback_only= supported[SNDRV_PCM_STREAM_CAPTURE] && !supported[SNDRV_PCM_STREAM_PLAYBACK];
Yes, this is nice idea.
Will do in v2 patch
Thank you for your help !!
Best regards
---
Kuninori Morimoto
PATCH 17/20 ASoC: soc-core.c: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/soc-core.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
sound/soc/soc-core.c +1 -19
@@ -1781,25 +1781,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dai_link->platforms->name = component->name;/* convert non BE into BE */ -if (!dai_link->no_pcm) { - dai_link->no_pcm =1 ; - -if (dai_link->dpcm_playback) -dev_warn (card->dev, -"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n" , - dai_link->name); -if (dai_link->dpcm_capture) -dev_warn (card->dev, -"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=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; - } - } + dai_link->no_pcm =1 ;/* * override any BE fixups
Signature · 1 line
2.25.1
Re: [PATCH 17/20] ASoC: soc-core.c: replace dpcm_playback/capture to playback/capture_only
Quoted 30 lines · Kuninori Morimoto
soc_get_playback_capture()is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.Signed-off-by Kuninori Morimoto <[email protected]>--- sound/soc/soc-core.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)sound/soc/soc-core.c +0
-13@@ -1781,25 +1781,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dai_link->platforms->name = component->name;/* convert non BE into BE */ -if (!dai_link->no_pcm) { - dai_link->no_pcm =1 ; - -if (dai_link->dpcm_playback) -dev_warn (card->dev, -"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n" , - dai_link->name); -if (dai_link->dpcm_capture) -dev_warn (card->dev, -"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n" , - dai_link->name); - -/* convert normal link into DPCM one */
sound/soc/soc-core.c static void soc_check_tplg_fes(struct snd_soc_card *card) · line 1787
Quoted 10 lines
sound/soc/soc-core.c +1
-6-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; - } - } + dai_link->no_pcm =1 ;/* * override any BE fixups
Somehow feels bit weird, but logically it makes sense, so
PATCH 18/20 ASoC: soc-topology.c: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/soc-topology-test.c | 2 -- sound/soc/soc-topology.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)
sound/soc/soc-topology-test.c +0 -2
@@ -94,8 +94,6 @@ 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, SND_SOC_DAILINK_REG(dummy, dummy, platform), }, };
sound/soc/soc-topology.c +2 -2
@@ -1735,8 +1735,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_only = !le32_to_cpu (pcm->capture); + link->capture_only = !le32_to_cpu (pcm->playback);if (pcm->flag_mask) set_link_flags(link, le32_to_cpu(pcm->flag_mask),
Signature · 1 line
2.25.1
Re: [PATCH 18/20] ASoC: soc-topology.c: replace dpcm_playback/capture to playback/capture_only
Quoted 28 lines · Kuninori Morimoto
soc_get_playback_capture()is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.Signed-off-by Kuninori Morimoto <[email protected]>--- sound/soc/soc-topology-test.c | 2 -- sound/soc/soc-topology.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)sound/soc/soc-topology-test.c +0
-2@@ -94,8 +94,6 @@ 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, SND_SOC_DAILINK_REG(dummy, dummy, platform), }, };sound/soc/soc-topology.c +0
-0
sound/soc/soc-topology.c static int soc_tplg_fe_link_create(struct soc_tplg *tplg, · line 1739
Quoted 7 lines
sound/soc/soc-topology.c +2
-2@@ -1735,8 +1735,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_only = !le32_to_cpu (pcm->capture); + link->capture_only = !le32_to_cpu (pcm->playback);
This seems to be similar case to patch 16, should it be:link->playback_only = le32_to_cpu(pcm->playback) && !le32_to_cpu(pcm->capture); link->capture_only = le32_to_cpu(pcm->capture) && !le32_to_cpu(pcm->playback); ?
Quoted 3 lines
sound/soc/soc-topology.c +0
-0if (pcm->flag_mask) set_link_flags(link, le32_to_cpu(pcm->flag_mask),
PATCH 19/20 ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only
In reply to Kuninori Morimotosoc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.
--- sound/soc/soc-compress.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
sound/soc/soc-compress.c +7 -4
@@ -602,12 +602,15 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)return -ENOMEM ;if (rtd->dai_link->dynamic) { +int playback = !rtd->dai_link->capture_only; +int capture = !rtd->dai_link->playback_only; +snprintf (new_name,sizeof (new_name),"(%s)" , 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); + playback, capture, &be_pcm);if (ret <0 ) { dev_err(rtd->card->dev, "Compress ASoC: can't create compressed for %s: %d\n",
@@ -620,9 +623,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 (playback) be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream->private_data = rtd; -if (rtd->dai_link->dpcm_capture) +if (capture) be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream->private_data = rtd;memcpy (compr->ops, &soc_compr_dyn_ops,sizeof (soc_compr_dyn_ops)); }else {
Signature · 1 line
2.25.1
Re: [PATCH 19/20] ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only
Quoted 6 lines · Kuninori Morimoto
soc_get_playback_capture()is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these.Signed-off-by Kuninori Morimoto <[email protected]>---
PATCH 20/20 ASoC: soc-pcm.c: remove dpcm_playback/capture
In reply to Kuninori MorimotoNo driver is using dpcm_playback/capture, let's remove these.
--- include/sound/soc.h | 4 ---- sound/soc/soc-pcm.c | 6 ------ 2 files changed, 10 deletions(-)
include/sound/soc.h +0 -4
@@ -729,10 +729,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; -/* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1;/* DPCM used FE & BE merged channel */
sound/soc/soc-pcm.c +0 -6
@@ -2757,12 +2757,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, cpu_playback =SNDRV_PCM_STREAM_CAPTURE ; } -/* REMOVE ME */ -if (dai_link->dpcm_playback && !dai_link->dpcm_capture) - dai_link->playback_only =1 ; -if (!dai_link->dpcm_playback && dai_link->dpcm_capture) - dai_link->capture_only =1 ; -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { codec_dai =asoc_rtd_to_codec (rtd, i);/* get paired codec */
Signature · 1 line
2.25.1
Re: [PATCH 20/20] ASoC: soc-pcm.c: remove dpcm_playback/capture
Quoted 4 lines · Kuninori Morimoto
No driver is using dpcm_playback/capture, let's remove these.
Signed-off-by Kuninori Morimoto <[email protected]>---