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

Commit 32902177 authored by John Keeping's avatar John Keeping Committed by Mark Brown
Browse files

ASoC: dapm: deprecate MICBIAS widget type 



Commit 086d7f80 ("ASoC: Convert WM8962 MICBIAS to a supply widget",
2011-09-23) says:

	A supply widget is generally clearer than a MICBIAS widget and a
	mic bias is just a type of supply so use a supply widget for the
	MICBIAS. This also avoids confusion with the routing when
	connected to multiple inputs.

but this has never been documented as a policy.  Add some comments to
make it clear.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f55532a0

include/sound/soc-dapm.h

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

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

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = wncontrols}

	.kcontrol_news = wcontrols, .num_kcontrols = wncontrols}

/* DEPRECATED: use SND_SOC_DAPM_SUPPLY */

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

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

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

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

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	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_out_drv,			/* output driver */

	snd_soc_dapm_adc,			/* analog to digital converter */

	snd_soc_dapm_adc,			/* analog to digital converter */

	snd_soc_dapm_dac,			/* digital to analog 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_mic,			/* microphone */

	snd_soc_dapm_hp,			/* headphones */

	snd_soc_dapm_hp,			/* headphones */

	snd_soc_dapm_spk,			/* speaker */

	snd_soc_dapm_spk,			/* speaker */