Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f84025ba authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

parents 86d811d8 32902177

include/sound/soc-dapm.h

+2 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct device; 
{       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = wncontrols}

/* DEPRECATED: use SND_SOC_DAPM_SUPPLY */

#define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \

{	.id = snd_soc_dapm_micbias, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
@@ -473,7 +474,7 @@ enum snd_soc_dapm_type { 
	snd_soc_dapm_out_drv,			/* output driver */

	snd_soc_dapm_adc,			/* analog to digital converter */

	snd_soc_dapm_dac,			/* digital to analog converter */

	snd_soc_dapm_micbias,		/* microphone bias (power) */

	snd_soc_dapm_micbias,		/* microphone bias (power) - DEPRECATED: use snd_soc_dapm_supply */

	snd_soc_dapm_mic,			/* microphone */

	snd_soc_dapm_hp,			/* headphones */

	snd_soc_dapm_spk,			/* speaker */