ASoC: twl6040: Convert MICBIAS to SUPPLY widget (778cee7a) · Commits · 戴 / test

sound/soc/codecs/twl6040.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1138,14 +1138,14 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
	TWL6040_REG_MICRCTL, 2, 0),		TWL6040_REG_MICRCTL, 2, 0),

	/* Microphone bias */		/* Microphone bias */
	SND_SOC_DAPM_MICBIAS("Headset Mic Bias",		SND_SOC_DAPM_SUPPLY("Headset Mic Bias",
	TWL6040_REG_AMICBCTL, 0, 0),		TWL6040_REG_AMICBCTL, 0, 0, NULL, 0),
	SND_SOC_DAPM_MICBIAS("Main Mic Bias",		SND_SOC_DAPM_SUPPLY("Main Mic Bias",
	TWL6040_REG_AMICBCTL, 4, 0),		TWL6040_REG_AMICBCTL, 4, 0, NULL, 0),
	SND_SOC_DAPM_MICBIAS("Digital Mic1 Bias",		SND_SOC_DAPM_SUPPLY("Digital Mic1 Bias",
	TWL6040_REG_DMICBCTL, 0, 0),		TWL6040_REG_DMICBCTL, 0, 0, NULL, 0),
	SND_SOC_DAPM_MICBIAS("Digital Mic2 Bias",		SND_SOC_DAPM_SUPPLY("Digital Mic2 Bias",
	TWL6040_REG_DMICBCTL, 4, 0),		TWL6040_REG_DMICBCTL, 4, 0, NULL, 0),

	/* DACs */		/* DACs */
	SND_SOC_DAPM_DAC("HSDAC Left", "Headset Playback", SND_SOC_NOPM, 0, 0),		SND_SOC_DAPM_DAC("HSDAC Left", "Headset Playback", SND_SOC_NOPM, 0, 0),

sound/soc/omap/omap-abe-twl6040.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -123,17 +123,17 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {

	static const struct snd_soc_dapm_route audio_map[] = {		static const struct snd_soc_dapm_route audio_map[] = {
	/* External Mics: MAINMIC, SUBMIC with bias*/		/* External Mics: MAINMIC, SUBMIC with bias*/
	{"MAINMIC", NULL, "Main Mic Bias"},		{"MAINMIC", NULL, "Ext Mic"},
	{"SUBMIC", NULL, "Main Mic Bias"},		{"SUBMIC", NULL, "Ext Mic"},
	{"Main Mic Bias", NULL, "Ext Mic"},		{"Ext Mic", NULL, "Main Mic Bias"},

	/* External Speakers: HFL, HFR */		/* External Speakers: HFL, HFR */
	{"Ext Spk", NULL, "HFL"},		{"Ext Spk", NULL, "HFL"},
	{"Ext Spk", NULL, "HFR"},		{"Ext Spk", NULL, "HFR"},

	/* Headset Mic: HSMIC with bias */		/* Headset Mic: HSMIC with bias */
	{"HSMIC", NULL, "Headset Mic Bias"},		{"HSMIC", NULL, "Headset Mic"},
	{"Headset Mic Bias", NULL, "Headset Mic"},		{"Headset Mic", NULL, "Headset Mic Bias"},

	/* Headset Stereophone (Headphone): HSOL, HSOR */		/* Headset Stereophone (Headphone): HSOL, HSOR */
	{"Headset Stereophone", NULL, "HSOL"},		{"Headset Stereophone", NULL, "HSOL"},
	@@ -182,8 +182,8 @@ static const struct snd_soc_dapm_widget dmic_dapm_widgets[] = {
	};		};

	static const struct snd_soc_dapm_route dmic_audio_map[] = {		static const struct snd_soc_dapm_route dmic_audio_map[] = {
	{"DMic", NULL, "Digital Mic1 Bias"},		{"DMic", NULL, "Digital Mic"},
	{"Digital Mic1 Bias", NULL, "Digital Mic"},		{"Digital Mic", NULL, "Digital Mic1 Bias"},
	};		};

	static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)		static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)

Admin message