diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-03 18:58:07 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-03 18:58:07 +0400 |
| commit | e73462f573d5d78df1aaec5561b3d6daae90f64a (patch) | |
| tree | 6a73f1ca4de0c8db1b624c97e2259ee975b88ec1 /include/sound | |
| parent | 2924a9981006ad01efb46c754689fa7d03e3eb4f (diff) | |
| parent | 62e5f676f6a063e1ab0d6b8fcaef2feb026ee00e (diff) | |
| download | linux-e73462f573d5d78df1aaec5561b3d6daae90f64a.tar.xz | |
Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-fsl
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 6 | ||||
| -rw-r--r-- | include/sound/soc.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 800c101bb096..243d3b689699 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -220,6 +220,8 @@ struct snd_soc_dai_driver { struct snd_soc_pcm_stream capture; struct snd_soc_pcm_stream playback; unsigned int symmetric_rates:1; + unsigned int symmetric_channels:1; + unsigned int symmetric_samplebits:1; /* probe ordering - for components with runtime dependencies */ int probe_order; @@ -244,6 +246,8 @@ struct snd_soc_dai { unsigned int capture_active:1; /* stream is in use */ unsigned int playback_active:1; /* stream is in use */ unsigned int symmetric_rates:1; + unsigned int symmetric_channels:1; + unsigned int symmetric_samplebits:1; struct snd_pcm_runtime *runtime; unsigned int active; unsigned char probed:1; @@ -258,6 +262,8 @@ struct snd_soc_dai { /* Symmetry data - only valid if symmetry is being enforced */ unsigned int rate; + unsigned int channels; + unsigned int sample_bits; /* parent platform/codec */ struct snd_soc_platform *platform; diff --git a/include/sound/soc.h b/include/sound/soc.h index 1f741cb24f33..1cda7d343d16 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -879,6 +879,8 @@ struct snd_soc_dai_link { /* Symmetry requirements */ unsigned int symmetric_rates:1; + unsigned int symmetric_channels:1; + unsigned int symmetric_samplebits:1; /* Do not create a PCM for this DAI link (Backend link) */ unsigned int no_pcm:1; |