Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
This commit is contained in:
Коммит
ad83abe9a6
|
@ -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 */
|
||||
|
|
|
@ -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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче