diff options
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc-dapm.h | 6 | ||||
-rw-r--r-- | include/sound/soc.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 01e7ad1f3f9d..bea0c8658aa0 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -356,6 +356,10 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, | |||
356 | int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, | 356 | int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, |
357 | struct snd_soc_dai *dai); | 357 | struct snd_soc_dai *dai); |
358 | int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); | 358 | int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); |
359 | int snd_soc_dapm_new_pcm(struct snd_soc_card *card, | ||
360 | const struct snd_soc_pcm_stream *params, | ||
361 | struct snd_soc_dapm_widget *source, | ||
362 | struct snd_soc_dapm_widget *sink); | ||
359 | 363 | ||
360 | /* dapm path setup */ | 364 | /* dapm path setup */ |
361 | int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm); | 365 | int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm); |
@@ -427,6 +431,7 @@ enum snd_soc_dapm_type { | |||
427 | snd_soc_dapm_aif_out, /* audio interface output */ | 431 | snd_soc_dapm_aif_out, /* audio interface output */ |
428 | snd_soc_dapm_siggen, /* signal generator */ | 432 | snd_soc_dapm_siggen, /* signal generator */ |
429 | snd_soc_dapm_dai, /* link to DAI structure */ | 433 | snd_soc_dapm_dai, /* link to DAI structure */ |
434 | snd_soc_dapm_dai_link, /* link between two DAI structures */ | ||
430 | }; | 435 | }; |
431 | 436 | ||
432 | enum snd_soc_dapm_subclass { | 437 | enum snd_soc_dapm_subclass { |
@@ -485,6 +490,7 @@ struct snd_soc_dapm_widget { | |||
485 | 490 | ||
486 | void *priv; /* widget specific data */ | 491 | void *priv; /* widget specific data */ |
487 | struct regulator *regulator; /* attached regulator */ | 492 | struct regulator *regulator; /* attached regulator */ |
493 | const struct snd_soc_pcm_stream *params; /* params for dai links */ | ||
488 | 494 | ||
489 | /* dapm control */ | 495 | /* dapm control */ |
490 | int reg; /* negative reg = no direct dapm */ | 496 | int reg; /* negative reg = no direct dapm */ |
diff --git a/include/sound/soc.h b/include/sound/soc.h index acb57b834e58..afc3204d389b 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -761,6 +761,8 @@ struct snd_soc_dai_link { | |||
761 | const struct device_node *cpu_dai_of_node; | 761 | const struct device_node *cpu_dai_of_node; |
762 | const char *codec_dai_name; | 762 | const char *codec_dai_name; |
763 | 763 | ||
764 | const struct snd_soc_pcm_stream *params; | ||
765 | |||
764 | unsigned int dai_fmt; /* format to set on init */ | 766 | unsigned int dai_fmt; /* format to set on init */ |
765 | 767 | ||
766 | /* Keep DAI active over suspend */ | 768 | /* Keep DAI active over suspend */ |