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

Commit c6e42977 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: codec: Change micbias widgets to supply widgets" into audio-drivers.lnx.5.0

parents b8ebaa77 2732740d

asoc/codecs/bolero/tx-macro.c

+7 −6
Original line number Diff line number Diff line
@@ -1393,9 +1393,10 @@ static const struct snd_soc_dapm_widget tx_macro_dapm_widgets_common[] = { 
	TX_MACRO_DAPM_MUX("TX SMIC MUX2", 0, tx_smic2_v2),

	TX_MACRO_DAPM_MUX("TX SMIC MUX3", 0, tx_smic3_v2),



	SND_SOC_DAPM_MICBIAS_E("TX MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("TX MIC BIAS1", SND_SOC_NOPM, 0, 0,

		tx_macro_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_ADC_E("TX DMIC0", NULL, SND_SOC_NOPM, 0, 0,

		tx_macro_enable_dmic, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMD),
@@ -1577,7 +1578,7 @@ static const struct snd_soc_dapm_widget tx_macro_dapm_widgets[] = { 
	TX_MACRO_DAPM_MUX("TX SMIC MUX6", 0, tx_smic6),

	TX_MACRO_DAPM_MUX("TX SMIC MUX7", 0, tx_smic7),



	SND_SOC_DAPM_MICBIAS_E("TX MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("TX MIC BIAS1", SND_SOC_NOPM, 0, 0,

		tx_macro_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_ADC_E("TX DMIC0", NULL, SND_SOC_NOPM, 0, 0,

asoc/codecs/bolero/va-macro.c

+6 −6
Original line number Diff line number Diff line
@@ -1685,7 +1685,7 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets_common[] = { 
	SND_SOC_DAPM_INPUT("VA SWR_MIC10"),

	SND_SOC_DAPM_INPUT("VA SWR_MIC11"),



	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

		va_macro_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -1838,7 +1838,7 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets[] = { 
	VA_MACRO_DAPM_MUX("VA SMIC MUX6", 0, va_smic6),

	VA_MACRO_DAPM_MUX("VA SMIC MUX7", 0, va_smic7),



	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

		va_macro_enable_micbias,

		SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

asoc/codecs/wcd938x/wcd938x.c

+8 −8
Original line number Diff line number Diff line
@@ -2624,19 +2624,19 @@ static const struct snd_soc_dapm_widget wcd938x_dapm_widgets[] = { 
				wcd938x_tx_swr_ctrl, SND_SOC_DAPM_PRE_PMU |

				SND_SOC_DAPM_POST_PMD),

	/* micbias widgets*/

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS1", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS2", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS2", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS3", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS3", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS4", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("MIC BIAS4", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),
@@ -2724,19 +2724,19 @@ static const struct snd_soc_dapm_widget wcd938x_dapm_widgets[] = { 
	SND_SOC_DAPM_OUTPUT("HPHR"),



	/* micbias pull up widgets*/

	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias_pullup,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS2", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS2", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias_pullup,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS3", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS3", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias_pullup,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("VA MIC BIAS4", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("VA MIC BIAS4", SND_SOC_NOPM, 0, 0,

				wcd938x_codec_enable_micbias_pullup,

				SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

				SND_SOC_DAPM_POST_PMD),