diff options
| author | Benoit Cousson <bcousson@baylibre.com> | 2014-07-08 23:19:34 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-16 23:58:49 +0200 |
| commit | 88bd870f02dff5c9445286e185f21873f25a977f (patch) | |
| tree | 329d25b67e687f6905e51b989db62c7268986fb1 /include/sound/soc-dai.h | |
| parent | Merge remote-tracking branch 'asoc/topic/component' into asoc-multi (diff) | |
| download | linux-88bd870f02dff5c9445286e185f21873f25a977f.tar.xz linux-88bd870f02dff5c9445286e185f21873f25a977f.zip | |
ASoC: core: Add initial support for DAI multicodec
DAI link assumes a one to one mapping between CPU DAI and CODEC. In
some cases, the same CPU DAI can be connected to several codecs.
This is the case for example, if you connect two mono codecs to the
same I2S link in order to have a stereo card.
The current ASoC implementation does not allow such setup.
Add support for DAI links composed of a single CPU DAI and multiple
CODECs. Sound cards have to pass the CODECs array in the corresponding
DAI link through a new 'snd_soc_dai_link_component' struct. Each CODEC in
this array is described in the same manner single CODEC DAIs are
(either DT/OF node or codec_name).
Multi-codec links are not supported in the case of CODEC to CODEC links.
Just print a warning if it happens.
Based on an original code done by Misael.
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Fabien Parent <fparent@baylibre.com>
Tested-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound/soc-dai.h')
| -rw-r--r-- | include/sound/soc-dai.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 031be2ab75d0..e8b3080d196a 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -272,6 +272,10 @@ struct snd_soc_dai { struct snd_soc_codec *codec; struct snd_soc_component *component; + /* CODEC TDM slot masks and params (for fixup) */ + unsigned int tx_mask; + unsigned int rx_mask; + struct snd_soc_card *card; struct list_head list; |