diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-16 16:42:53 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-16 16:42:53 +0400 |
| commit | 99896f714a0a940d84476bc6208319f70af30789 (patch) | |
| tree | 89002aa02e1308caf0c6a9d99fb5a722aee750e0 /include | |
| parent | a9b68d3b90988dd13c668d6b1d45cdca1557f070 (diff) | |
| parent | f7d3c17096f6cbca8f0113d5a092ffcc72c7bf41 (diff) | |
| download | linux-99896f714a0a940d84476bc6208319f70af30789.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 2 | ||||
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 243d3b689699..71f27c403194 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -123,6 +123,8 @@ int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, int direction); +int snd_soc_dai_is_dummy(struct snd_soc_dai *dai); + struct snd_soc_dai_ops { /* * DAI clocking configuration, all optional. diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 56ebdfca6273..68d92e36facd 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -412,6 +412,7 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, struct snd_soc_dai *dai); int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); +void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); int snd_soc_dapm_new_pcm(struct snd_soc_card *card, const struct snd_soc_pcm_stream *params, struct snd_soc_dapm_widget *source, |