aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-dai.h4
-rw-r--r--include/sound/soc-dapm.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 2413acc54883..adb07fcd712c 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -17,6 +17,7 @@
17#include <linux/list.h> 17#include <linux/list.h>
18 18
19struct snd_pcm_substream; 19struct snd_pcm_substream;
20struct snd_soc_dapm_widget;
20 21
21/* 22/*
22 * DAI hardware audio formats. 23 * DAI hardware audio formats.
@@ -238,6 +239,9 @@ struct snd_soc_dai {
238 unsigned char pop_wait:1; 239 unsigned char pop_wait:1;
239 unsigned char probed:1; 240 unsigned char probed:1;
240 241
242 struct snd_soc_dapm_widget *playback_widget;
243 struct snd_soc_dapm_widget *capture_widget;
244
241 /* DAI DMA data */ 245 /* DAI DMA data */
242 void *playback_dma_data; 246 void *playback_dma_data;
243 void *capture_dma_data; 247 void *capture_dma_data;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 91eb8126c00e..e46107fffeb4 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -355,6 +355,9 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
355int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, 355int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
356 const struct snd_soc_dapm_widget *widget, 356 const struct snd_soc_dapm_widget *widget,
357 int num); 357 int num);
358int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
359 struct snd_soc_dai *dai);
360int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
358 361
359/* dapm path setup */ 362/* dapm path setup */
360int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm); 363int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm);
@@ -425,6 +428,7 @@ enum snd_soc_dapm_type {
425 snd_soc_dapm_aif_in, /* audio interface input */ 428 snd_soc_dapm_aif_in, /* audio interface input */
426 snd_soc_dapm_aif_out, /* audio interface output */ 429 snd_soc_dapm_aif_out, /* audio interface output */
427 snd_soc_dapm_siggen, /* signal generator */ 430 snd_soc_dapm_siggen, /* signal generator */
431 snd_soc_dapm_dai, /* link to DAI structure */
428}; 432};
429 433
430/* 434/*