Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-fsl

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;