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

Commit 832a9414 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/davinci' and 'asoc/fix/max98090' into asoc-linus

parents fd7aff54 19926c6d f69e3caa

sound/soc/codecs/max98090.c

+2 −2
Original line number Diff line number Diff line
@@ -1311,8 +1311,6 @@ static const struct snd_soc_dapm_route max98090_dapm_routes[] = { 
	{"MIC1 Input", NULL, "MIC1"},

	{"MIC2 Input", NULL, "MIC2"},



	{"DMICL", NULL, "DMICL_ENA"},

	{"DMICR", NULL, "DMICR_ENA"},

	{"DMICL", NULL, "AHPF"},

	{"DMICR", NULL, "AHPF"},
@@ -1370,6 +1368,8 @@ static const struct snd_soc_dapm_route max98090_dapm_routes[] = { 
	{"DMIC Mux", "ADC", "ADCR"},

	{"DMIC Mux", "DMIC", "DMICL"},

	{"DMIC Mux", "DMIC", "DMICR"},

	{"DMIC Mux", "DMIC", "DMICL_ENA"},

	{"DMIC Mux", "DMIC", "DMICR_ENA"},



	{"LBENL Mux", "Normal", "DMIC Mux"},

	{"LBENL Mux", "Loopback", "LTENL Mux"},

sound/soc/davinci/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ config SND_DM365_AIC3X_CODEC 
	  Say Y if you want to add support for AIC3101 audio codec



config SND_DM365_VOICE_CODEC

	bool "Voice Codec - CQ93VC"

	tristate "Voice Codec - CQ93VC"

	depends on SND_DAVINCI_SOC

	select MFD_DAVINCI_VOICECODEC

	select SND_DAVINCI_SOC_VCIF

	select SND_SOC_CQ0093VC