diff options
| author | Mark Brown <[email protected]> | 2022-07-08 21:46:29 +0100 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2022-07-08 21:46:29 +0100 |
| commit | 7d596d9bb2ae4d0a7a59199792c13ea02f0d2c76 (patch) | |
| tree | 8ad0d18b01510abaf410d5330999bf7c541d55d3 /include | |
| parent | bf02bb4d3b68792d24258b4dbb5676a3ae1cfaff (diff) | |
| parent | 16b7ba9c0f53032e2a9365f3de89b66426b5716c (diff) | |
ASoC: audio-graph-card2.c: make Codec2Codec settings optional
Merge series from Kuninori Morimoto <[email protected]>:
Audio Graph Card2 has Codec2Codec support, but I noticed
- Current Codec2Codec setting value is not correct
because it is using of_get_property().
- simple-card-utils has default Codec2Codec settings
and it is overwriting Card2 settings
- This default settings works for non Codec2Codec case
(= DPCM::BE case) too.
This patch-set solve these issues.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/simple_card_utils.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index fe2337fde1f4..ab55f40896e0 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -51,7 +51,6 @@ struct prop_nums { int cpus; int codecs; int platforms; - int c2c; }; struct asoc_simple_priv { @@ -64,7 +63,6 @@ struct asoc_simple_priv { struct snd_soc_dai_link_component *platforms; struct asoc_simple_data adata; struct snd_soc_codec_conf *codec_conf; - struct snd_soc_pcm_stream *c2c_conf; struct prop_nums num; unsigned int mclk_fs; } *dai_props; @@ -75,7 +73,6 @@ struct asoc_simple_priv { struct snd_soc_dai_link_component *dlcs; struct snd_soc_dai_link_component dummy; struct snd_soc_codec_conf *codec_conf; - struct snd_soc_pcm_stream *c2c_conf; struct gpio_desc *pa_gpio; const struct snd_soc_ops *ops; unsigned int dpcm_selectable:1; |