diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-12-01 18:14:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-01 18:14:13 +0000 |
| commit | f299eccc0ff0d8bdab7b5f0858bcc59e1d3a731f (patch) | |
| tree | f99f10b660b29bbf1493d6747e2f515bfeea805f /include/sound | |
| parent | ASoC: core: mark SND_SOC_BYTES_EXT as deprecated (diff) | |
| parent | ASoC: dapm: add a dapm sink widget (diff) | |
| download | linux-dev-f299eccc0ff0d8bdab7b5f0858bcc59e1d3a731f.tar.xz linux-dev-f299eccc0ff0d8bdab7b5f0858bcc59e1d3a731f.zip | |
Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 7855cfe46b69..fe19dd3abb00 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -49,6 +49,9 @@ struct device; #define SND_SOC_DAPM_SIGGEN(wname) \ { .id = snd_soc_dapm_siggen, .name = wname, .kcontrol_news = NULL, \ .num_kcontrols = 0, .reg = SND_SOC_NOPM } +#define SND_SOC_DAPM_SINK(wname) \ +{ .id = snd_soc_dapm_sink, .name = wname, .kcontrol_news = NULL, \ + .num_kcontrols = 0, .reg = SND_SOC_NOPM } #define SND_SOC_DAPM_INPUT(wname) \ { .id = snd_soc_dapm_input, .name = wname, .kcontrol_news = NULL, \ .num_kcontrols = 0, .reg = SND_SOC_NOPM } @@ -484,6 +487,7 @@ enum snd_soc_dapm_type { snd_soc_dapm_aif_in, /* audio interface input */ snd_soc_dapm_aif_out, /* audio interface output */ snd_soc_dapm_siggen, /* signal generator */ + snd_soc_dapm_sink, snd_soc_dapm_dai_in, /* link to DAI structure */ snd_soc_dapm_dai_out, snd_soc_dapm_dai_link, /* link between two DAI structures */ |