Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
This commit is contained in:
Коммит
3b88210da3
|
@ -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 }
|
||||
|
@ -485,6 +488,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 */
|
||||
|
|
|
@ -293,6 +293,9 @@
|
|||
{.base = xbase, .num_regs = xregs, \
|
||||
.mask = xmask }) }
|
||||
|
||||
/*
|
||||
* SND_SOC_BYTES_EXT is deprecated, please USE SND_SOC_BYTES_TLV instead
|
||||
*/
|
||||
#define SND_SOC_BYTES_EXT(xname, xcount, xhandler_get, xhandler_put) \
|
||||
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
|
||||
.info = snd_soc_bytes_info_ext, \
|
||||
|
|
|
@ -1300,7 +1300,7 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
|
|||
|
||||
static int dapm_always_on_check_power(struct snd_soc_dapm_widget *w)
|
||||
{
|
||||
return 1;
|
||||
return w->connected;
|
||||
}
|
||||
|
||||
static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
|
||||
|
@ -3358,6 +3358,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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче