tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
+9
+4
include/sound/soc-dapm.h
+4
include/sound/soc-dapm.h
···
49
49
#define SND_SOC_DAPM_SIGGEN(wname) \
50
50
{ .id = snd_soc_dapm_siggen, .name = wname, .kcontrol_news = NULL, \
51
51
.num_kcontrols = 0, .reg = SND_SOC_NOPM }
52
+
#define SND_SOC_DAPM_SINK(wname) \
53
+
{ .id = snd_soc_dapm_sink, .name = wname, .kcontrol_news = NULL, \
54
+
.num_kcontrols = 0, .reg = SND_SOC_NOPM }
52
55
#define SND_SOC_DAPM_INPUT(wname) \
53
56
{ .id = snd_soc_dapm_input, .name = wname, .kcontrol_news = NULL, \
54
57
.num_kcontrols = 0, .reg = SND_SOC_NOPM }
···
487
484
snd_soc_dapm_aif_in, /* audio interface input */
488
485
snd_soc_dapm_aif_out, /* audio interface output */
489
486
snd_soc_dapm_siggen, /* signal generator */
487
+
snd_soc_dapm_sink,
490
488
snd_soc_dapm_dai_in, /* link to DAI structure */
491
489
snd_soc_dapm_dai_out,
492
490
snd_soc_dapm_dai_link, /* link between two DAI structures */
+5
sound/soc/soc-dapm.c
+5
sound/soc/soc-dapm.c
···
3351
3351
w->is_ep = SND_SOC_DAPM_EP_SOURCE;
3352
3352
w->power_check = dapm_always_on_check_power;
3353
3353
break;
3354
+
case snd_soc_dapm_sink:
3355
+
w->is_ep = SND_SOC_DAPM_EP_SINK;
3356
+
w->power_check = dapm_always_on_check_power;
3357
+
break;
3358
+
3354
3359
case snd_soc_dapm_mux:
3355
3360
case snd_soc_dapm_demux:
3356
3361
case snd_soc_dapm_switch: