ASoC: replace dpcm_playback/capture to playback/capture_only
Subsystems (14)
Kuninori Morimoto
maintainercover ASoC: replace dpcm_playback/capture to playback/capture_only
Hi Mark
When we use DPCM, we need to set dpcm_playback/capture flag. If these flag are set, soc_get_playback_capture() will check its availability, but non DPCM case is checked without special flags.
OTOH, it cares playback/capture_only flag. It is needed.
This patch remove DPCM special flag, and replace it playback/capture_only flag if needed.
Kuninori Morimoto (15):
ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
ASoC: amd: replace dpcm_playback/capture to playback/capture_only
ASoC: fsl: replace dpcm_playback/capture to playback/capture_only
ASoC: sof: replace dpcm_playback/capture to playback/capture_only
ASoC: meson: replace dpcm_playback/capture to playback/capture_only
ASoC: Intel: replace dpcm_playback/capture to playback/capture_only
ASoC: samsung: replace dpcm_playback/capture to playback/capture_only
ASoC: mediatek: replace dpcm_playback/capture to playback/capture_only
ASoC: Intel/avs: replace dpcm_playback/capture to playback/capture_only
ASoC: soc-core.c: replace dpcm_playback/capture to playback/capture_only
ASoC: soc-topology.c: replace dpcm_playback/capture to playback/capture_only
ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only
ASoC: remove snd_soc_dai_link_set_capabilities()
ASoC: soc-pcm.c: remove dpcm_playback/capture
ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings
include/sound/soc-dai.h | 1 - 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 | 24 ++--- sound/soc/amd/acp3x-rt5682-max9836.c | 6 +- sound/soc/amd/vangogh/acp5x-mach.c | 6 -- sound/soc/fsl/fsl-asoc-card.c | 16 ++-- sound/soc/fsl/imx-audmix.c | 6 +- sound/soc/fsl/imx-card.c | 7 +- sound/soc/generic/audio-graph-card.c | 2 - sound/soc/generic/audio-graph-card2.c | 2 - sound/soc/generic/simple-card.c | 2 - sound/soc/intel/avs/boards/da7219.c | 2 - sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/es8336.c | 2 - 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/rt5514.c | 2 +- sound/soc/intel/avs/boards/rt5663.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_board_helpers.c | 12 +-- sound/soc/intel/boards/sof_da7219.c | 33 +++---- sound/soc/intel/boards/sof_es8336.c | 8 +- sound/soc/intel/boards/sof_pcm512x.c | 8 +- sound/soc/intel/boards/sof_sdw.c | 4 +- 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/mt7986/mt7986-wm8960.c | 6 +- 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 | 58 ++++++------ .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++++-------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 ++++++------- sound/soc/meson/axg-card.c | 9 +- sound/soc/meson/gx-card.c | 1 - sound/soc/meson/meson-card-utils.c | 4 +- sound/soc/qcom/common.c | 1 - sound/soc/samsung/odroid.c | 11 ++- sound/soc/soc-compress.c | 10 ++- sound/soc/soc-core.c | 20 +---- sound/soc/soc-dai.c | 38 -------- sound/soc/soc-pcm.c | 88 ++++++++----------- sound/soc/soc-topology-test.c | 2 - sound/soc/soc-topology.c | 4 +- sound/soc/sof/nocodec.c | 4 - 91 files changed, 507 insertions(+), 876 deletions(-)
Signature · 1 line
2.25.1
Kuninori Morimoto
maintainerPATCH 1/15 ASoC: soc-pcm.c: cleanup soc_get_playback_capture()
Current soc_get_playback_capture() (A) is checking playback/capture availability for DPCM (X) / Normal (Y) / Codec2Codec (Z) connections.
(A) static int soc_get_playback_capture(...)
{
...
^ if (dai_link->dynamic || dai_link->no_pcm) {
| ...
|(a) if (dai_link->dpcm_playback) {
| ...
| ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|(*) ...
| v }
| ...
(X) }
|(b) if (dai_link->dpcm_capture) {
| ...
| ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|(*) ...
| v }
| ...
v }
} else { ^ ^ /* Adapt stream for codec2codec links */
|(Z) int cpu_capture = ...
| v int cpu_playback = ...
(Y)
| ^ for_each_rtd_ch_maps(rtd, i, ch_maps) {
|(*) ...
v v }
} ... }
(*) part is checking each DAI's availability.
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; dpcm_playback = 0; => error dpcm_capture = 0;
This patch convert dpcm_ flags to _only flag, and dpcm_ flag will be removed if all driver switched to _only flags.
Here, CPU <-> Codec relationship is like this
DPCM [CPU/dummy]-[dummy/Codec] ^^^^ ^^^^^ Normal [CPU/Codec] ^^^^^^^^^^^
DPCM part (X) is checking only CPU DAI, and
Normal part (Y) is checking both CPU/Codec DAI
Here, validation check on dummy DAI is always true, Therefor we want to expand validation check to all cases.
One note here is that unfortunately DPCM BE Codec had been no validation check before, but all cases validation check breaks compatibility on some vender's devices. Thus this patch ignore it.
--- sound/soc/soc-pcm.c | 90 +++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 52 deletions(-)
sound/soc/soc-pcm.c +38 -52
@@ -2793,7 +2793,12 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, int *playback, int *capture) { struct snd_soc_dai_link *dai_link = rtd->dai_link; +struct snd_soc_dai_link_ch_map *ch_maps;struct snd_soc_dai *cpu_dai; +struct snd_soc_dai *codec_dai; +struct snd_soc_dai *dummy_dai =snd_soc_find_dai (&snd_soc_dummy_dlc); +int cpu_playback; +int cpu_capture;int has_playback =0 ;int has_capture =0 ;int i;
@@ -2803,65 +2808,46 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,return -EINVAL ; } +/* REMOVE ME */ if (dai_link->dynamic || dai_link->no_pcm) { -int stream; - -if (dai_link->dpcm_playback) { - stream =SNDRV_PCM_STREAM_PLAYBACK ; - -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { -if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - has_playback =1 ; -break ; - } - } -if (!has_playback) { -dev_err (rtd->card->dev, -"No CPU DAIs support playback for stream %s\n" , - dai_link->stream_name); -return -EINVAL ; - } +if (dai_link->dpcm_playback && !dai_link->dpcm_capture) + dai_link->playback_only =1 ; +if (!dai_link->dpcm_playback && dai_link->dpcm_capture) + dai_link->capture_only =1 ; +if (!dai_link->dpcm_playback && !dai_link->dpcm_capture) { +dev_err (rtd->dev,"no dpcm_playback/capture are selected\n" ); +return -EINVAL ; } -if (dai_link->dpcm_capture) { - stream =SNDRV_PCM_STREAM_CAPTURE ; + } -for_each_rtd_cpu_dais (rtd, i, cpu_dai) { -if (snd_soc_dai_stream_valid (cpu_dai, stream)) { - has_capture =1 ; -break ; - } - } +/* Adapt stream for codec2codec links */ + cpu_playback =snd_soc_get_stream_cpu (dai_link,SNDRV_PCM_STREAM_PLAYBACK ); + cpu_capture =snd_soc_get_stream_cpu (dai_link,SNDRV_PCM_STREAM_CAPTURE ); -if (!has_capture) { -dev_err (rtd->card->dev, -"No CPU DAIs support capture for stream %s\n" , - dai_link->stream_name); -return -EINVAL ; - } - } - }else { -struct snd_soc_dai_link_ch_map *ch_maps; -struct snd_soc_dai *codec_dai; - -/* Adapt stream for codec2codec links */ -int cpu_capture =snd_soc_get_stream_cpu (dai_link,SNDRV_PCM_STREAM_CAPTURE ); -int cpu_playback =snd_soc_get_stream_cpu (dai_link,SNDRV_PCM_STREAM_PLAYBACK ); +/* +* see +* soc.h :: [dai_link->ch_maps Image sample] +*/ +for_each_rtd_ch_maps (rtd, i, ch_maps) { + cpu_dai =snd_soc_rtd_to_cpu (rtd, ch_maps->cpu); + codec_dai =snd_soc_rtd_to_codec (rtd, ch_maps->codec);/* -* see -* soc.h :: [dai_link->ch_maps Image sample] +* FIXME +* +* DPCM BE Codec has been no checked before. +* It should be checked, but it breaks compatibility. +* It ignores BE Codec here, so far. */ -for_each_rtd_ch_maps (rtd, i, ch_maps) { - cpu_dai =snd_soc_rtd_to_cpu (rtd, ch_maps->cpu); - codec_dai =snd_soc_rtd_to_codec (rtd, ch_maps->codec); - -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && -snd_soc_dai_stream_valid (cpu_dai, cpu_playback)) - has_playback =1 ; -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && -snd_soc_dai_stream_valid (cpu_dai, cpu_capture)) - has_capture =1 ; - } +if (dai_link->no_pcm) + codec_dai = dummy_dai; + +if (snd_soc_dai_stream_valid (cpu_dai, cpu_playback) && +snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK )) + has_playback =1 ; +if (snd_soc_dai_stream_valid (cpu_dai, cpu_capture) && +snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE )) + has_capture =1 ; }if (dai_link->playback_only)
Signature · 1 line
2.25.1
Kuninori Morimoto
maintainerPATCH 2/15 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 | 24 +++++++----------------- sound/soc/amd/acp3x-rt5682-max9836.c | 6 ++---- sound/soc/amd/vangogh/acp5x-mach.c | 6 ------ 5 files changed, 19 insertions(+), 39 deletions(-)
sound/soc/amd/acp-da7219-max98357a.c +10 -10
@@ -542,7 +542,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_da7219_init, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_play_ops, SND_SOC_DAILINK_REG(designware1, dlgs, platform),
@@ -552,7 +552,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_cap_ops, SND_SOC_DAILINK_REG(designware2, dlgs, platform),
@@ -562,7 +562,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "HiFi Playback", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -573,7 +573,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -584,7 +584,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform),
@@ -598,7 +598,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_rt5682_init, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_play_ops, SND_SOC_DAILINK_REG(designware1, rt5682, platform),
@@ -608,7 +608,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_cap_ops, SND_SOC_DAILINK_REG(designware2, rt5682, platform),
@@ -618,7 +618,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "HiFi Playback", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -629,7 +629,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -640,7 +640,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform),
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, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, - .dpcm_capture = 1, - .dpcm_playback = 1, .init = st_es8336_init, .ops = &st_es8336_ops, SND_SOC_DAILINK_REG(designware1, codec, platform),
sound/soc/amd/acp/acp-mach-common.c +7 -17
@@ -1407,8 +1407,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_sp); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->hs_codec_id) {
@@ -1444,8 +1442,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_hs); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->hs_codec_id) {
@@ -1480,7 +1476,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) } links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; + links[i].playback_only =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->amp_codec_id) {
@@ -1512,7 +1508,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; + links[i].playback_only =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->amp_codec_id) {
@@ -1527,7 +1523,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].init = acp_card_maxim_init; }if (drv_data->amp_codec_id ==MAX98388 ) { - links[i].dpcm_capture =1 ; + links[i].capture_only =1 ; links[i].codecs = max98388; links[i].num_codecs =ARRAY_SIZE (max98388); links[i].ops = &acp_max98388_ops;
@@ -1553,8 +1549,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (sof_bt); links[i].platforms = sof_component; links[i].num_platforms =ARRAY_SIZE (sof_component); - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ; links[i].nonatomic = true; links[i].no_pcm =1 ;if (!drv_data->bt_codec_id) {
@@ -1574,7 +1568,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 ; }
@@ -1613,8 +1607,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (i2s_sp); links[i].platforms = platform_component; links[i].num_platforms =ARRAY_SIZE (platform_component); - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ;if (!drv_data->hs_codec_id) {/* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc;
@@ -1657,8 +1649,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 = &snd_soc_dummy_dlc;
@@ -1686,7 +1676,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus =ARRAY_SIZE (i2s_sp); links[i].platforms = platform_component; links[i].num_platforms =ARRAY_SIZE (platform_component); - links[i].dpcm_playback =1 ; + links[i].playback_only =1 ;if (!drv_data->amp_codec_id) {/* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc;
@@ -1724,7 +1714,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 = &snd_soc_dummy_dlc;
@@ -1774,7 +1764,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
@@ -317,8 +317,6 @@ static struct snd_soc_dai_link acp3x_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = acp3x_5682_init, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp3x_5682_ops, SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform), },
@@ -327,7 +325,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "HiFi Playback", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, .ops = &acp3x_max_play_ops, .cpus = acp3x_bt, .num_cpus = ARRAY_SIZE(acp3x_bt),
@@ -339,7 +337,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "Capture DMIC0", .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_capture = 1, + .capture_only = 1, .ops = &acp3x_ec_cap0_ops, SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform), },
sound/soc/amd/vangogh/acp5x-mach.c +0 -6
@@ -276,8 +276,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
@@ -288,7 +286,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform),
@@ -375,8 +372,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
@@ -387,7 +382,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_max98388_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform),
Signature · 1 line
2.25.1
Kuninori Morimoto
maintainerPATCH 3/15 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
@@ -319,8 +319,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), },
@@ -329,8 +327,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), },
@@ -648,8 +644,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;
@@ -675,15 +671,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
@@ -258,10 +258,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,
@@ -283,8 +283,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
@@ -817,8 +817,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
Kuninori Morimoto
maintainerPATCH 4/15 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
Kuninori Morimoto
maintainerPATCH 5/15 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
@@ -186,9 +186,9 @@ int meson_card_set_fe_link(struct snd_soc_card *card, link->dpcm_merged_rate =1 ;if (is_playback) - link->dpcm_playback =1 ; + link->playback_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
Kuninori Morimoto
maintainerPATCH 6/15 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.
--- 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_board_helpers.c | 12 ++--- sound/soc/intel/boards/sof_da7219.c | 33 ++++-------- sound/soc/intel/boards/sof_es8336.c | 8 ++- sound/soc/intel/boards/sof_pcm512x.c | 8 +-- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_wm8804.c | 2 - 35 files changed, 205 insertions(+), 328 deletions(-)
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
@@ -504,7 +504,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .init = broxton_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -516,7 +516,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -527,7 +527,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system2, dummy, platform), },
@@ -536,7 +536,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio Reference cap", .stream_name = "Refcap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_refcap_ops,
@@ -547,7 +547,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_dmic_ops,
@@ -557,7 +557,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -567,7 +567,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -577,7 +577,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -594,7 +594,7 @@ static struct snd_soc_dai_link broxton_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = broxton_ssp_fixup, - .dpcm_playback =1 , + .playback_only =1 , SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, {
@@ -607,8 +607,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), }, {
@@ -616,7 +614,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), },
@@ -624,7 +622,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), },
@@ -632,7 +630,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), },
@@ -640,7 +638,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), },
@@ -648,7 +646,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), },
@@ -837,7 +835,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
@@ -315,8 +315,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), },
@@ -326,7 +324,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), },
@@ -339,8 +337,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
@@ -1533,8 +1533,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), },
@@ -1543,7 +1541,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), },
@@ -1555,8 +1553,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
@@ -462,8 +462,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),
@@ -473,7 +471,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), },
@@ -490,8 +488,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
@@ -448,8 +448,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), },
@@ -458,7 +456,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), },
@@ -470,8 +468,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
@@ -358,8 +358,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), },
@@ -368,7 +366,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), },
@@ -381,8 +379,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
@@ -460,7 +460,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -471,7 +471,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), },
@@ -479,7 +479,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops,
@@ -489,7 +489,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops,
@@ -498,7 +498,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -509,7 +509,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@ -522,7 +522,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1,
@@ -540,7 +540,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback =1 , + .playback_only =1 , SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, {
@@ -553,8 +553,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), }, {
@@ -562,14 +560,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),
@@ -578,7 +576,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), },
@@ -586,7 +584,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_board_helpers.c +3 -9
@@ -139,8 +139,6 @@ int sof_intel_board_set_codec_link(struct device *dev, link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; - link->dpcm_playback = 1; return 0; }
@@ -192,7 +190,7 @@ int sof_intel_board_set_dmic_link(struct device *dev, link->init = dmic_init; link->ignore_suspend = 1; link->no_pcm = 1; - link->dpcm_capture = 1; + link->capture_only = 1; return 0; }
@@ -252,7 +250,7 @@ int sof_intel_board_set_intel_hdmi_link(struct device *dev, link->id = be_id; link->init = (hdmi_id == 1) ? hdmi_init : NULL; link->no_pcm = 1; - link->dpcm_playback = 1; + link->playback_only = 1; return 0; }
@@ -293,8 +291,6 @@ int sof_intel_board_set_ssp_amp_link(struct device *dev, link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; /* feedback stream or firmware-generated echo reference */ - link->dpcm_playback = 1; return 0; }
@@ -336,8 +332,6 @@ int sof_intel_board_set_bt_link(struct device *dev, link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; - link->dpcm_playback = 1; return 0; }
@@ -379,7 +373,7 @@ int sof_intel_board_set_hdmi_in_link(struct device *dev, link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; + link->capture_only = 1; return 0; }
sound/soc/intel/boards/sof_da7219.c +11 -22
@@ -296,8 +296,6 @@ static struct snd_soc_dai_link jsl_dais[] = { .id = 0, .ignore_pmdown_time = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, /* IV feedback */ SND_SOC_DAILINK_REG(ssp1_pin, max_98373_components, platform), }, {
@@ -306,15 +304,13 @@ static struct snd_soc_dai_link jsl_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), },
@@ -322,7 +318,7 @@ static struct snd_soc_dai_link jsl_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), },
@@ -330,7 +326,7 @@ static struct snd_soc_dai_link jsl_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), },
@@ -338,7 +334,7 @@ static struct snd_soc_dai_link jsl_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), },
@@ -346,7 +342,7 @@ static struct snd_soc_dai_link jsl_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), }
@@ -360,15 +356,13 @@ static struct snd_soc_dai_link adl_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 = 1, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), },
@@ -376,7 +370,7 @@ static struct snd_soc_dai_link adl_dais[] = { .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), },
@@ -384,7 +378,7 @@ static struct snd_soc_dai_link adl_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), },
@@ -392,7 +386,7 @@ static struct snd_soc_dai_link adl_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), },
@@ -400,7 +394,7 @@ static struct snd_soc_dai_link adl_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), },
@@ -408,7 +402,7 @@ static struct snd_soc_dai_link adl_dais[] = { .name = "iDisp4", .id = 6, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform), },
@@ -416,17 +410,12 @@ static struct snd_soc_dai_link adl_dais[] = { .name = "SSP1-Codec", .id = 7, .no_pcm = 1, - .dpcm_playback = 1, - /* feedback stream or firmware-generated echo reference */ - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, max_98373_components, platform), }, { .name = "SSP2-BT", .id = 8, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp2_pin, dummy_codec, 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_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_sdw.c +2 -2
@@ -1185,8 +1185,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_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 06/15] ASoC: Intel: replace dpcm_playback/capture to playback/capture_only
Hi Morimoto-san,
Quoted 3 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.
This patch no longer applies since Mark merged "[PATCH 00/21] ASoC: Intel: boards: updates for 6.10 - part1"
https://lore.kernel.org/linux-sound/[email protected]/
The odds of additional conflicts are very high due to the number of queued changes in machine drivers, I really don't know how we're going to find the time to solve those conflicts and test experimental versions, while we're also busy checking the 6.9-rc1 transition.
In addition, I have a bit of heartburn with the concept of flipping the logic from a clear description of playback or capture supported, to an implicit 'both supported unless stated otherwise'. We are going to miss some cases and have regressions, it's pretty much a given.
And then there are cases such as the following examples
Quoted 25 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +0
-4@@ -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,@@ -293,8 +291,6 @@ int sof_intel_board_set_ssp_amp_link(struct device *dev, link->id = be_id; link->no_pcm =1 ; - link->dpcm_capture =1 ;/* feedback stream or firmware-generated echo reference */ - link->dpcm_playback =1 ;return 0 ; }sound/soc/intel/boards/sof_da7219.c +0
-0
sound/soc/intel/boards/sof_da7219.c static struct snd_soc_dai_link jsl_dais[] = { · line 299
Quoted 6 lines
sound/soc/intel/boards/sof_da7219.c +0
-2@@ -296,8 +296,6 @@ static struct snd_soc_dai_link jsl_dais[] = { .id = 0, .ignore_pmdown_time = 1, .no_pcm =1 , - .dpcm_playback = 1, - .dpcm_capture =1 ,/* IV feedback */ SND_SOC_DAILINK_REG(ssp1_pin, max_98373_components, platform),
where we lose comments on what the capture stream is. That's not so good, we added those comments on purpose to explain that the capture stream isn't a regular PCM format, I don't see a good reason to see them go?
Kuninori Morimoto
maintainerRe: [PATCH 06/15] ASoC: Intel: replace dpcm_playback/capture to playback/capture_only
Hi Pierre-Louis
Thank you for your feedback
Quoted 4 lines
In addition, I have a bit of heartburn with the concept of flipping the logic from a clear description of playback or capture supported, to an implicit 'both supported unless stated otherwise'. We are going to miss some cases and have regressions, it's pretty much a given.
Amadeusz indicated similar things, but it is not so strange for me. Because it has driver to use it, default "supported" is very natural. And, normal connection case is using this style (= default supported"), only DPCM needs special flag.
But I have no special objection about flag direction, I just followed existing style. If you and/or Amadeusz want different style (and there was no objection from other reviews/maintainor), I can follow to it.
Quoted 1 line
Quoted 1 line
sound/soc/intel/boards/cml_rt1011_rt5682.c +0
-1- .dpcm_capture = 1, /* Capture stream provides Feedback */
(snip)
Quoted 1 line
Quoted 1 line
sound/soc/intel/boards/sof_board_helpers.c +0
-1- link->dpcm_capture =1 ;/* feedback stream or firmware-generated echo reference */
(snip)
Quoted 1 line
Quoted 1 line
sound/soc/intel/boards/sof_da7219.c +0
-1- .dpcm_capture = 1, /* IV feedback */
(snip)
Quoted 3 lines
where we lose comments on what the capture stream is. That's not so good, we added those comments on purpose to explain that the capture stream isn't a regular PCM format, I don't see a good reason to see them go?
Ah, thank you for poining these.
Indeed the comments should not be removed.
I will fix it on v2
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
Kuninori Morimoto
maintainerPATCH 7/15 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 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
sound/soc/samsung/odroid.c +5 -6
@@ -171,25 +171,24 @@ 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), }, {/* Secondary FE <-> BE link */ - .playback_only =1 , .ops = &odroid_card_fe_ops, .name = "Secondary", .stream_name = "Secondary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(secondary), } };
@@ -278,8 +277,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
Kuninori Morimoto
maintainerPATCH 8/15 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/mt7986/mt7986-wm8960.c | 6 +- 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 | 58 ++++++------- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++++--------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 +++++++------ 15 files changed, 212 insertions(+), 312 deletions(-)
sound/soc/mediatek/mt2701/mt2701-cs42448.c +5 -15
@@ -221,7 +221,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_playback =1 , + .playback_only =1 , SND_SOC_DAILINK_REG(fe_multi_ch_out), }, [DAI_LINK_FE_PCM0_IN] = {
@@ -231,7 +231,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture =1 , + .capture_only =1 , SND_SOC_DAILINK_REG(fe_pcm0_in), }, [DAI_LINK_FE_PCM1_IN] = {
@@ -241,7 +241,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture =1 , + .capture_only =1 , SND_SOC_DAILINK_REG(fe_pcm1_in), }, [DAI_LINK_FE_BT_OUT] = {
@@ -250,7 +250,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_bt_out), }, [DAI_LINK_FE_BT_IN] = {
@@ -259,7 +259,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_bt_in), },/* BE */
@@ -269,8 +269,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture =1 , SND_SOC_DAILINK_REG(be_i2s0), }, [DAI_LINK_BE_I2S1] = {
@@ -279,8 +277,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture =1 , SND_SOC_DAILINK_REG(be_i2s1), }, [DAI_LINK_BE_I2S2] = {
@@ -289,8 +285,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture =1 , SND_SOC_DAILINK_REG(be_i2s2), }, [DAI_LINK_BE_I2S3] = {
@@ -299,15 +293,11 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1,SND_SOC_DAILINK_REG (be_i2s3), }, [DAI_LINK_BE_MRG_BT] = { .name ="mt2701-cs42448-MRG-BT" , .no_pcm =1 , - .dpcm_playback =1 , - .dpcm_capture =1 ,SND_SOC_DAILINK_REG (be_mrg_bt), }, };
sound/soc/mediatek/mt2701/mt2701-wm8960.c +2 -4
@@ -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/mt7986/mt7986-wm8960.c +2 -4
@@ -45,7 +45,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, {
@@ -54,7 +54,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), },/* BE */
@@ -65,8 +65,6 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, };
sound/soc/mediatek/mt8173/mt8173-max98090.c +2 -4
@@ -104,7 +104,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, {
@@ -112,7 +112,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), },/* Back End DAI links */
@@ -123,8 +123,6 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .ops = &mt8173_max98090_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(hifi), }, };
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +2 -4
@@ -139,7 +139,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = {
@@ -147,7 +147,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), },/* Back End DAI links */
@@ -159,8 +159,6 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5514_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, };
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +4 -6
@@ -171,7 +171,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = {
@@ -179,7 +179,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = {
@@ -187,7 +187,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), },
@@ -200,14 +200,12 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5676_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1,SND_SOC_DAILINK_REG (codec), }, [DAI_LINK_HDMI_I2S] = { .name ="HDMI BE" , .no_pcm =1 , - .dpcm_playback =1 , + .playback_only =1 ,SND_SOC_DAILINK_REG (hdmi_be), }, /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */
sound/soc/mediatek/mt8173/mt8173-rt5650.c +4 -6
@@ -210,7 +210,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = {
@@ -218,7 +218,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = {
@@ -226,7 +226,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), },/* Back End DAI links */
@@ -238,14 +238,12 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1,SND_SOC_DAILINK_REG (codec), }, [DAI_LINK_HDMI_I2S] = { .name ="HDMI BE" , .no_pcm =1 , - .dpcm_playback =1 , + .playback_only =1 , .init = mt8173_rt5650_hdmi_init,SND_SOC_DAILINK_REG (hdmi_be), },
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +14 -20
@@ -425,7 +425,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(playback1), },
@@ -435,7 +435,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), },
@@ -445,7 +445,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, {
@@ -454,7 +454,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), },
@@ -464,7 +464,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, {
@@ -473,7 +473,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(capture3), },
@@ -483,7 +483,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, {
@@ -492,38 +492,32 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* BE */ { .name ="Primary Codec" , .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name ="PCM 1" , .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name ="PCM 2" , .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name ="I2S0" , .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -532,7 +526,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -541,7 +535,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_da7219_i2s_ops,
@@ -551,13 +545,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops,
@@ -570,7 +564,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ignore = 1,
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 +28 -30
231 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
Kuninori Morimoto
maintainerPATCH 9/15 ASoC: Intel/avs: 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/intel/avs/boards/da7219.c | 2 -- sound/soc/intel/avs/boards/dmic.c | 4 ++-- sound/soc/intel/avs/boards/es8336.c | 2 -- 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/rt5514.c | 2 +- sound/soc/intel/avs/boards/rt5663.c | 2 -- sound/soc/intel/avs/boards/rt5682.c | 2 -- sound/soc/intel/avs/boards/ssm4567.c | 2 -- 16 files changed, 4 insertions(+), 32 deletions(-)
sound/soc/intel/avs/boards/da7219.c +0 -2
@@ -203,8 +203,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/es8336.c +0 -2
@@ -233,8 +233,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_es8336_ops; dl->nonatomic =1 ; dl->no_pcm =1 ; - dl->dpcm_capture =1 ; - dl->dpcm_playback =1 ; *dai_link = dl;
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 ;
@@ -160,8 +158,6 @@ static struct snd_soc_dai_link probing_link = { .id = -1, .nonatomic = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .cpus = &snd_soc_dummy_dlc, .num_cpus = 1, .init = avs_probing_link_init,
sound/soc/intel/avs/boards/i2s_test.c +0 -2
@@ -46,8 +46,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
@@ -82,7 +82,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_max98357a_be_fixup; dl->nonatomic =1 ; dl->no_pcm =1 ; - dl->dpcm_playback =1 ; + dl->playback_only =1 ; *dai_link = dl;
sound/soc/intel/avs/boards/max98373.c +0 -2
@@ -134,8 +134,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
@@ -131,8 +131,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
@@ -210,8 +210,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
@@ -183,8 +183,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
@@ -153,8 +153,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
@@ -173,8 +173,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/rt5514.c +1 -1
@@ -121,7 +121,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_rt5514_be_fixup; dl->nonatomic =1 ; dl->no_pcm =1 ; - dl->dpcm_capture =1 ; + dl->capture_only =1 ; dl->ops = &avs_rt5514_ops; *dai_link = dl;
sound/soc/intel/avs/boards/rt5663.c +0 -2
@@ -171,8 +171,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_rt5663_be_fixup; dl->nonatomic =1 ; dl->no_pcm =1 ; - dl->dpcm_capture =1 ; - dl->dpcm_playback =1 ; dl->ops = &avs_rt5663_ops; *dai_link = dl;
sound/soc/intel/avs/boards/rt5682.c +0 -2
@@ -242,8 +242,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
@@ -123,8 +123,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;
Signature · 1 line
2.25.1
Re: [PATCH 09/15] ASoC: Intel/avs: 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]>---
ASoC: Intel: avs: boards: Replace dpcm_playback/capture to playback/capture_only
Fix prefix and start commit title from capital letter, otherwise seems good.
Kuninori Morimoto
maintainerRe: [PATCH 09/15] ASoC: Intel/avs: replace dpcm_playback/capture to playback/capture_only
Hi Amadeusz
Thank you for your review
Quoted 11 lines
Quoted 6 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.Signed-off-by Kuninori Morimoto <[email protected]>---
ASoC: Intel: avs: boards: Replace dpcm_playback/capture to playback/capture_only
Fix prefix and start commit title from capital letter, otherwise seems good.
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
Kuninori Morimoto
maintainerPATCH 10/15 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
@@ -2000,25 +2000,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
Kuninori Morimoto
maintainerPATCH 11/15 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
@@ -88,8 +88,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
@@ -1720,8 +1720,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->playback) && !le32_to_cpu (pcm->capture); + link->capture_only =le32_to_cpu (pcm->capture) && !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
Kuninori Morimoto
maintainerPATCH 12/15 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
sound/soc/soc-compress.c +6 -4
@@ -606,12 +606,14 @@ 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",
@@ -624,9 +626,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
Kuninori Morimoto
maintainerPATCH 13/15 ASoC: remove snd_soc_dai_link_set_capabilities()
In reply to Kuninori Morimotosnd_soc_dai_link_set_capabilities() checks all CPU/Codec DAI (Y)(Z) for Playback/Capture (X) and checks its validation (A), and setup dpcm_playback/capture flags (a).
void snd_soc_dai_link_set_capabilities(...)
{
...
(X) for_each_pcm_streams(direction) {
...
(Y) for_each_link_cpus(dai_link, i, cpu) {
...
(A) if (... snd_soc_dai_stream_valid(...)) {
...
}
}
(Z) for_each_link_codecs(dai_link, i, codec) {
...
(A) if (... snd_soc_dai_stream_valid(...)) {
...
}
}
...
}(a) dai_link->dpcm_playback = supported[...];
(a) dai_link->dpcm_capture = supported[...]; }
This validation check will be automatically done on new soc_get_playback_capture(). snd_soc_dai_link_set_capabilities() is no longer needed. Let's remove it.
--- include/sound/soc-dai.h | 1 - sound/soc/fsl/imx-card.c | 3 --- sound/soc/generic/audio-graph-card.c | 2 -- sound/soc/generic/audio-graph-card2.c | 2 -- sound/soc/generic/simple-card.c | 2 -- sound/soc/meson/axg-card.c | 1 - sound/soc/meson/gx-card.c | 1 - sound/soc/qcom/common.c | 1 - sound/soc/soc-dai.c | 38 --------------------------- 9 files changed, 51 deletions(-)
include/sound/soc-dai.h +0 -1
@@ -219,7 +219,6 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai);int snd_soc_dai_compress_new (struct snd_soc_dai *dai,struct snd_soc_pcm_runtime *rtd,int num);bool snd_soc_dai_stream_valid (struct snd_soc_dai *dai,int stream); -void snd_soc_dai_link_set_capabilities (struct snd_soc_dai_link *dai_link);void snd_soc_dai_action (struct snd_soc_dai *dai,int stream,int action); static inline void snd_soc_dai_activate(struct snd_soc_dai *dai,
sound/soc/fsl/imx-card.c +0 -3
@@ -650,9 +650,6 @@ static int imx_card_parse_of(struct imx_card_data *data) link->ops = &imx_aif_ops; } -if (link->no_pcm || link->dynamic) -snd_soc_dai_link_set_capabilities (link); -/* Get dai fmt */ ret =simple_util_parse_daifmt (dev, np, codec,NULL , &link->dai_fmt);
sound/soc/generic/audio-graph-card.c +0 -2
@@ -246,8 +246,6 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv,graph_parse_convert (dev, ep, &dai_props->adata); -snd_soc_dai_link_set_capabilities (dai_link); - ret =graph_link_init (priv, cpu_ep, codec_ep, li, dai_name); li->link++;
sound/soc/generic/audio-graph-card2.c +0 -2
@@ -925,8 +925,6 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv,graph_parse_convert (ep, dai_props);/* at node of <dpcm> */ graph_parse_convert (rep, dai_props);/* at node of <CPU/Codec> */ -snd_soc_dai_link_set_capabilities (dai_link); -graph_link_init (priv, rport, li, is_cpu); err:of_node_put (ep);
sound/soc/generic/simple-card.c +0 -2
@@ -276,8 +276,6 @@ static int simple_dai_link_of_dpcm(struct simple_util_priv *priv,simple_parse_convert (dev, np, &dai_props->adata); -snd_soc_dai_link_set_capabilities (dai_link); - ret =simple_link_init (priv, node, codec, li, prefix, dai_name); out_put_node:
sound/soc/meson/axg-card.c +0 -1
@@ -338,7 +338,6 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, dai_link->num_c2c_params =1 ; }else { dai_link->no_pcm =1 ; -snd_soc_dai_link_set_capabilities (dai_link);if (axg_card_cpu_is_tdm_iface (dai_link->cpus->of_node)) ret =axg_card_parse_tdm (card, np, index); }
sound/soc/meson/gx-card.c +0 -1
@@ -107,7 +107,6 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, dai_link->num_c2c_params =1 ; }else { dai_link->no_pcm =1 ; -snd_soc_dai_link_set_capabilities (dai_link);/* Check if the cpu is the i2s encoder and parse i2s data */ if (gx_card_cpu_identify (dai_link->cpus,"I2S Encoder" )) ret =gx_card_parse_i2s (card, np, index);
sound/soc/qcom/common.c +0 -1
@@ -145,7 +145,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card)if (platform || !codec) {/* DPCM */ -snd_soc_dai_link_set_capabilities (link); link->ignore_suspend =1 ; link->nonatomic =1 ; }
sound/soc/soc-dai.c +0 -38
@@ -479,44 +479,6 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir)return stream->channels_min; } -/* -* snd_soc_dai_link_set_capabilities() - set dai_link properties based on its DAIs -*/ -void snd_soc_dai_link_set_capabilities (struct snd_soc_dai_link *dai_link) -{ -bool supported[SNDRV_PCM_STREAM_LAST +1 ]; -int direction; - -for_each_pcm_streams (direction) { -struct snd_soc_dai_link_component *cpu; -struct snd_soc_dai_link_component *codec; -struct snd_soc_dai *dai; -bool supported_cpu = false; -bool supported_codec = false; -int i; - -for_each_link_cpus (dai_link, i, cpu) { - dai =snd_soc_find_dai_with_mutex (cpu); -if (dai &&snd_soc_dai_stream_valid (dai, direction)) { - supported_cpu = true; -break ; - } - } -for_each_link_codecs (dai_link, i, codec) { - dai =snd_soc_find_dai_with_mutex (codec); -if (dai &&snd_soc_dai_stream_valid (dai, direction)) { - supported_codec = true; -break ; - } - } - supported[direction] = supported_cpu && supported_codec; - } - - dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK ]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE ]; -} -EXPORT_SYMBOL_GPL (snd_soc_dai_link_set_capabilities); -void snd_soc_dai_action (struct snd_soc_dai *dai,int stream,int action) {
Signature · 1 line
2.25.1
Kuninori Morimoto
maintainerPATCH 14/15 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 | 12 ------------ 2 files changed, 16 deletions(-)
include/sound/soc.h +0 -4
@@ -793,10 +793,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 -12
@@ -2808,18 +2808,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,return -EINVAL ; } -/* REMOVE ME */ -if (dai_link->dynamic || dai_link->no_pcm) { -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 ; -if (!dai_link->dpcm_playback && !dai_link->dpcm_capture) { -dev_err (rtd->dev,"no dpcm_playback/capture are selected\n" ); -return -EINVAL ; - } - } -/* Adapt stream for codec2codec links */ cpu_playback =snd_soc_get_stream_cpu (dai_link,SNDRV_PCM_STREAM_PLAYBACK ); cpu_capture =snd_soc_get_stream_cpu (dai_link,SNDRV_PCM_STREAM_CAPTURE );
Signature · 1 line
2.25.1
Kuninori Morimoto
maintainerPATCH 15/15 ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings
In reply to Kuninori MorimotoHistorically, ASoC doesn't have validation check for DPCM BE Codec, but it should have. Current ASoC is ignoring it same as before, but let's indicate the warning about that.
This warning and code should be removed and cleanuped if DPCM BE Codec has necessary settings.
One of the big user which doesn't have it is Intel.
--- sound/soc/codecs/hda.c ---
static struct snd_soc_dai_driver card_binder_dai = {
.id = -1,
.name = "codec-probing-DAI",
+ .capture.channels_min = 1,
+ .playback.channels_min = 1,
};
--- sound/pci/hda/patch_hdmi.c ---
static int generic_hdmi_build_pcms(...)
{
...
for (...) {
...
+ pstr->channels_min = 1;
}
return 0;
}--- sound/soc/soc-pcm.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
sound/soc/soc-pcm.c +22 -10
@@ -2796,7 +2796,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai_link_ch_map *ch_maps;struct snd_soc_dai *cpu_dai;struct snd_soc_dai *codec_dai; -struct snd_soc_dai *dummy_dai =snd_soc_find_dai (&snd_soc_dummy_dlc);int cpu_playback;int cpu_capture;int has_playback =0 ;
@@ -2817,24 +2816,37 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,* soc.h :: [dai_link->ch_maps Image sample] */ for_each_rtd_ch_maps (rtd, i, ch_maps) { - cpu_dai =snd_soc_rtd_to_cpu (rtd, ch_maps->cpu); - codec_dai =snd_soc_rtd_to_codec (rtd, ch_maps->codec); +int cpu_play_t, cpu_capture_t; +int codec_play_t, codec_capture_t; + + cpu_dai =snd_soc_rtd_to_cpu (rtd, ch_maps->cpu); + codec_dai =snd_soc_rtd_to_codec (rtd, ch_maps->codec); + + cpu_play_t =snd_soc_dai_stream_valid (cpu_dai, cpu_playback); + codec_play_t =snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ); + + cpu_capture_t =snd_soc_dai_stream_valid (cpu_dai, cpu_capture); + codec_capture_t =snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE );/* -* FIXME +* FIXME / CLEAN-UP-ME * * DPCM BE Codec has been no checked before. * It should be checked, but it breaks compatibility. * It ignores BE Codec here, so far. */ -if (dai_link->no_pcm) - codec_dai = dummy_dai; +if ((dai_link->no_pcm) && + ((cpu_play_t && !codec_play_t) || + (cpu_capture_t && !codec_capture_t))) { +dev_warn_once (rtd->dev,"DCPM BE Codec has no stream settings (%s)\n" , + codec_dai->name); + codec_play_t =1 ; + codec_capture_t =1 ; + } -if (snd_soc_dai_stream_valid (cpu_dai, cpu_playback) && -snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK )) +if (cpu_play_t && codec_play_t) has_playback =1 ; -if (snd_soc_dai_stream_valid (cpu_dai, cpu_capture) && -snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE )) +if (cpu_capture_t && codec_capture_t) has_capture =1 ; }
Signature · 1 line
2.25.1
Jerome Brunet
maintainerRe: [PATCH 15/15] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings
Quoted 6 lines · Kuninori Morimoto
Historically, ASoC doesn't have validation check for DPCM BE Codec, but it should have. Current ASoC is ignoring it same as before, but let's indicate the warning about that.
This warning and code should be removed and cleanuped if DPCM BE Codec has necessary settings.
Hello Kuninori-san,
I'm not quite sure what you mean by "should have validation" and what setting exactly we should validate ?
I know I should be able to able to understand that from the code below but, somehow I have trouble deciphering it.
Could you explain it a bit more ?
I wonder if this going to trip over the same corner case as last time:
Where you have a CPU supporting both direction and 2 codecs, each supporting 1 stream direction ? This is a valid i2s configuration.
Maybe I'm not understanding the patchset correctly.
Quoted 66 lines
One of the big user which doesn't have it is Intel.
--- sound/soc/codecs/hda.c --- static struct snd_soc_dai_driver card_binder_dai = { .id = -1, .name = "codec-probing-DAI",(quoted diff) +2
-0+ .capture.channels_min = 1, + .playback.channels_min = 1,}; --- sound/pci/hda/patch_hdmi.c --- static int generic_hdmi_build_pcms(...) { ... for (...) { ...(quoted diff) +1
-0+ pstr->channels_min = 1;} return 0; }Cc Amadeusz Sławiński <[email protected]>Signed-off-by Kuninori Morimoto <[email protected]>--- sound/soc/soc-pcm.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)sound/soc/soc-pcm.c +12
-4@@ -2796,7 +2796,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai_link_ch_map *ch_maps;struct snd_soc_dai *cpu_dai;struct snd_soc_dai *codec_dai; -struct snd_soc_dai *dummy_dai =snd_soc_find_dai (&snd_soc_dummy_dlc);int cpu_playback;int cpu_capture;int has_playback =0 ;@@ -2817,24 +2816,37 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,* soc.h :: [dai_link->ch_maps Image sample] */ for_each_rtd_ch_maps (rtd, i, ch_maps) { - cpu_dai =snd_soc_rtd_to_cpu (rtd, ch_maps->cpu); - codec_dai =snd_soc_rtd_to_codec (rtd, ch_maps->codec); +int cpu_play_t, cpu_capture_t; +int codec_play_t, codec_capture_t; + + cpu_dai =snd_soc_rtd_to_cpu (rtd, ch_maps->cpu); + codec_dai =snd_soc_rtd_to_codec (rtd, ch_maps->codec); + + cpu_play_t =snd_soc_dai_stream_valid (cpu_dai, cpu_playback); + codec_play_t =snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ); + + cpu_capture_t =snd_soc_dai_stream_valid (cpu_dai, cpu_capture); + codec_capture_t =snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE );/* -* FIXME +* FIXME / CLEAN-UP-ME * * DPCM BE Codec has been no checked before.
sound/soc/soc-pcm.c static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, · line 2842
Quoted 10 lines
sound/soc/soc-pcm.c +5
-2* It should be checked, but it breaks compatibility. * It ignores BE Codec here, so far. */ -if (dai_link->no_pcm) - codec_dai = dummy_dai; +if ((dai_link->no_pcm) && + ((cpu_play_t && !codec_play_t) || + (cpu_capture_t && !codec_capture_t))) { +dev_warn_once (rtd->dev,"DCPM BE Codec has no stream settings (%s)\n" , + codec_dai->name);
Taking one codec at a time, would you trigger a warning for the use case I described above ?
Quoted 13 lines
sound/soc/soc-pcm.c +5
-4+ codec_play_t =1 ; + codec_capture_t =1 ; + } -if (snd_soc_dai_stream_valid (cpu_dai, cpu_playback) && -snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK )) +if (cpu_play_t && codec_play_t) has_playback =1 ; -if (snd_soc_dai_stream_valid (cpu_dai, cpu_capture) && -snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE )) +if (cpu_capture_t && codec_capture_t) has_capture =1 ; }
Signature · 1 line
Jerome
Kuninori Morimoto
maintainerRe: [PATCH 15/15] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings
Hi Jerome
Thank you for your feedback
Quoted 5 lines
I'm not quite sure what you mean by "should have validation" and what setting exactly we should validate ?
I know I should be able to able to understand that from the code below but, somehow I have trouble deciphering it.
Current ASoC have validation for ^^^ part
DPCM [CPU/xxxx]-[xxxx/Codec] ^^^^ (A) Normal [CPU/Codec] ^^^^^^^^^^^
(In many case, this "xxxx" is "dummy")
By this patch-set, It will check all cases
DPCM [CPU/xxxx]-[xxxx/Codec] ^^^^^^^^^ ^^^^^^^^^^ (B) Normal [CPU/Codec] ^^^^^^^^^^^
At first, in [CPU/xxxx] case, "xxxx" part should be also checked (in many case, this "xxxx" is "dummy").
And, because it didn't check (A) part before,
(B) part might be error on some board (at least Intel board). To avoid such case, temporally it uses "dummy" instead of "Codec" before [15/15]. This means (B) part checked as like below.
[xxxx/Codec] -> [xxxx/dummy]
Because "dummy" will pass all cases, (B) part is almost same as no check. Yes, it is no meaning, but the code will be simple.
Quoted 2 lines
Where you have a CPU supporting both direction and 2 codecs, each supporting 1 stream direction ? This is a valid i2s configuration.
(snip)
Quoted 10 lines
Quoted 10 lines
sound/soc/soc-pcm.c +1
-3/* -* FIXME +* FIXME / CLEAN-UP-ME * * DPCM BE Codec has been no checked before. * It should be checked, but it breaks compatibility. * It ignores BE Codec here, so far. */ -if (dai_link->no_pcm) - codec_dai = dummy_dai;
Quoted 8 lines
sound/soc/soc-pcm.c static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, · line 2842
Quoted 5 lines
sound/soc/soc-pcm.c +5
-0+if ((dai_link->no_pcm) && + ((cpu_play_t && !codec_play_t) || + (cpu_capture_t && !codec_capture_t))) { +dev_warn_once (rtd->dev,"DCPM BE Codec has no stream settings (%s)\n" , + codec_dai->name);Taking one codec at a time, would you trigger a warning for the use case I described above ?
Oops, indeed it will indicate warning in your case. How about this ?
if ((dai_link->no_pcm) &&
(!codec_play_t && !codec_capture_t)) {
dev_warn_once(...)
...
}Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
Jerome Brunet
maintainerRe: [PATCH 15/15] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings
Quoted 12 lines · Kuninori Morimoto
Hi Jerome
Thank you for your feedback
Quoted 5 lines
I'm not quite sure what you mean by "should have validation" and what setting exactly we should validate ?
I know I should be able to able to understand that from the code below but, somehow I have trouble deciphering it.
Current ASoC have validation for ^^^ part
Quoted 8 lines
DPCM [CPU/xxxx]-[xxxx/Codec] ^^^^ (A) Normal [CPU/Codec] ^^^^^^^^^^^(In many case, this "xxxx" is "dummy")
Yes for many DPCM user, you have:
DPCM
[CPU/dummy]-[dummy/Codec]FYI: on Amlogic it is mostly the following
(only considering DCPM, omitting C2C ...)
DPCM
[CPU-FE/dummy]-[CPU-BE/Codec]With possibly several BE instances per FE, and several codecs per BE.
And there is even this for loopbacks:
DPCM
[CPU-FE/dummy]-[CPU-BE/dummy]Quoted 44 lines
By this patch-set, It will check all cases
DPCM [CPU/xxxx]-[xxxx/Codec] ^^^^^^^^^ ^^^^^^^^^^ (B) Normal [CPU/Codec] ^^^^^^^^^^^At first, in [CPU/xxxx] case, "xxxx" part should be also checked (in many case, this "xxxx" is "dummy").
And, because it didn't check (A) part before,
(B) part might be error on some board (at least Intel board). To avoid such case, temporally it uses "dummy" instead of "Codec" before [15/15]. This means (B) part checked as like below.[xxxx/Codec] -> [xxxx/dummy]Because "dummy" will pass all cases, (B) part is almost same as no check. Yes, it is no meaning, but the code will be simple.
Quoted 2 lines
Where you have a CPU supporting both direction and 2 codecs, each supporting 1 stream direction ? This is a valid i2s configuration.
(snip)
Quoted 10 lines
Quoted 10 lines
sound/soc/soc-pcm.c +1
-3/* -* FIXME +* FIXME / CLEAN-UP-ME * * DPCM BE Codec has been no checked before. * It should be checked, but it breaks compatibility. * It ignores BE Codec here, so far. */ -if (dai_link->no_pcm) - codec_dai = dummy_dai;Quoted 8 lines
sound/soc/soc-pcm.c static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, · line 2842
Quoted 5 lines
sound/soc/soc-pcm.c +5
-0+if ((dai_link->no_pcm) && + ((cpu_play_t && !codec_play_t) || + (cpu_capture_t && !codec_capture_t))) { +dev_warn_once (rtd->dev,"DCPM BE Codec has no stream settings (%s)\n" , + codec_dai->name);Taking one codec at a time, would you trigger a warning for the use case I described above ?
Quoted 4 lines
Oops, indeed it will indicate warning in your case. How about this ?
if ((dai_link->no_pcm) &&
^ Actually my comment applies to all links, DPCM backend or not
Quoted 1 line
(!codec_play_t && !codec_capture_t)) {A codec that does not support playback and does not support capture does not support much, does it ? ;)
I suppose you meant something like:
Quoted 1 line
(!cpu_play_t && !codec_capture_t)) { Then at first glance, maybe ... CPU and codec seem to exclude each other but that will only work as long as DCPM is limited to a single CPU per link.
Quoted 10 lines
dev_warn_once(...) ... }Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
Signature · 1 line
Jerome
Kuninori Morimoto
maintainerRe: [PATCH 15/15] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings
Hi Jerome
Thank you for your feedback
Quoted 3 lines
DPCM [CPU/xxxx]-[xxxx/Codec] ^^^^ (A)
(snip)
Quoted 3 lines
DPCM [CPU/xxxx]-[xxxx/Codec] ^^^^^^^^^ ^^^^^^^^^^ (B)
(snip)
Quoted 2 lines
Quoted 1 line
if ((dai_link->no_pcm) &&^ Actually my comment applies to all links, DPCM backend or not
(snip)
Quoted 2 lines
A codec that does not support playback and does not support capture does not support much, does it ? ;)
Unfortunately, some codec which is used on DPCM BE doesn't have .channels_min = 1 settings which is used on snd_soc_dai_stream_valid(). At least Intel is using it. For both Playback/Capture.
But it *was* no problem, because (A) part was not checked before.
Because of this background, [01/15] patch is using dummy Codec to avoid (B) check.
[15/15] patch will indicate WARNING for such codec driver instead of just avoiding.
At least, below are the drivers. It is mentioned in git-log.
sound/soc/codecs/hda.c
sound/pci/hda/patch_hdmi.c
dai_link->no_pcm only is OK I think, because it needs to keep compatibility and try to indicates warning for (A) and/or (B) part. If such things happen on FE side, it is just error, not warning.
Quoted 4 lines
(!cpu_play_t && !codec_capture_t)) {Then at first glance, maybe ... CPU and codec seem to exclude each other but that will only work as long as DCPM is limited to a single CPU per link.
Hmm ?? I'm confusing
Did you copy-and-paste miss ??
I have never indicate this pair
+ I have indicated before
- I have not
+ ( cpu_capture_t && !codec_capture_t) // in [15/15] patch
+ (!codec_play_t && !codec_capture_t) // in previous mail
- (!cpu_play_t && !codec_capture_t)
and I'm sorry but I can't understand what you want to tell me. Do you mean Multi-CPU case ?
If you can indicate Image or code, it can more help me.
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto
Quoted 12 lines · Kuninori Morimoto
Hi Mark
When we use DPCM, we need to set dpcm_playback/capture flag. If these flag are set,
soc_get_playback_capture()will check its availability, but non DPCM case is checked without special flags.OTOH, it cares playback/capture_only flag. It is needed.
This patch remove DPCM special flag, and replace it playback/capture_only flag if needed.
One general note, I wonder if playback/capture_only should be renamed to something more descriptive, current names are a bit weird from use case point of view. I mean no flags, means both capture and playback are enabled. Then you do something like playback_only = 1, which effectively affects capture stream. Notice that flag is named playback, but affects capture. Perhaps, something like capture_disabled, playback_disabled would make more sense? This would also make more sense to me for something like playback_only = 1; capture_only = 1; which while weird doesn't instantly seem that wrong, while disable on both directions instantly seems broken.
Kuninori Morimoto
maintainerHi Amadeusz
Quoted 10 lines
One general note, I wonder if playback/capture_only should be renamed to something more descriptive, current names are a bit weird from use case point of view. I mean no flags, means both capture and playback are enabled. Then you do something like
playback_only= 1, which effectively affects capture stream. Notice that flag is named playback, but affects capture. Perhaps, something likecapture_disabled,playback_disabledwould make more sense? This would also make more sense to me for something likeplayback_only= 1;capture_only= 1; which while weird doesn't instantly seem that wrong, while disable on both directions instantly seems broken.
This patch-set is just using existing style, no special intention.
Basically, I have no special objection about _only vs _disabled, but I think it will be 50:50 no matter which style we choose.
But switching "_only" into "_disabled" should be another patch-set, I think. But I'm happy to do it if everyone want it.
Thank you for your help !!
Best regards
---
Renesas Electronics
Ph.D. Kuninori Morimoto