diff options
| author | Mark Brown <broonie@kernel.org> | 2015-12-09 15:01:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-09 15:01:44 +0000 |
| commit | ad83abe9a60e185b255df2534de3a9e669d65859 (patch) | |
| tree | 653e469eda7c08a00bd55e6d26d126d8cec01344 | |
| parent | 9ec2053b13f75d7ad9c0e6db9763954bd1a1b9ae (diff) | |
| parent | 56b4437f15ed2003413b857e08740576332e72d7 (diff) | |
| download | op-kernel-dev-ad83abe9a60e185b255df2534de3a9e669d65859.zip op-kernel-dev-ad83abe9a60e185b255df2534de3a9e669d65859.tar.gz | |
Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
| -rw-r--r-- | include/sound/soc-dapm.h | 4 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 7855cfe..fe19dd3 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 */ diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 3eba72c..506677b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3351,6 +3351,11 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, w->is_ep = SND_SOC_DAPM_EP_SOURCE; w->power_check = dapm_always_on_check_power; break; + case snd_soc_dapm_sink: + w->is_ep = SND_SOC_DAPM_EP_SINK; + w->power_check = dapm_always_on_check_power; + break; + case snd_soc_dapm_mux: case snd_soc_dapm_demux: case snd_soc_dapm_switch: |
