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

Commit c81ab3d7 authored by Siarhei Volkau's avatar Siarhei Volkau Committed by Greg Kroah-Hartman
Browse files

ASoC: codecs: jz4725b: fix capture selector naming 



[ Upstream commit 80852f8268769715db335a22305e81a0c4a38a84 ]

At the moment Capture source selector appears on Playback
tab in the alsamixer and has a senseless name.

Let's fix that.

Signed-off-by: default avatarSiarhei Volkau <lis8215@gmail.com>
Link: https://lore.kernel.org/r/20221016132648.3011729-5-lis8215@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5b94d1bb

sound/soc/codecs/jz4725b.c

+7 −7
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static SOC_VALUE_ENUM_SINGLE_DECL(jz4725b_codec_adc_src_enum, 
				  jz4725b_codec_adc_src_texts,

				  jz4725b_codec_adc_src_values);

static const struct snd_kcontrol_new jz4725b_codec_adc_src_ctrl =

			SOC_DAPM_ENUM("Route", jz4725b_codec_adc_src_enum);

	SOC_DAPM_ENUM("ADC Source Capture Route", jz4725b_codec_adc_src_enum);



static const struct snd_kcontrol_new jz4725b_codec_mixer_controls[] = {

	SOC_DAPM_SINGLE("Line In Bypass", JZ4725B_CODEC_REG_CR1,
@@ -228,7 +228,7 @@ static const struct snd_soc_dapm_widget jz4725b_codec_dapm_widgets[] = { 
	SND_SOC_DAPM_ADC("ADC", "Capture",

			 JZ4725B_CODEC_REG_PMR1, REG_PMR1_SB_ADC_OFFSET, 1),



	SND_SOC_DAPM_MUX("ADC Source", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_MUX("ADC Source Capture Route", SND_SOC_NOPM, 0, 0,

			 &jz4725b_codec_adc_src_ctrl),



	/* Mixer */
@@ -287,11 +287,11 @@ static const struct snd_soc_dapm_route jz4725b_codec_dapm_routes[] = { 
	{"Mixer", NULL, "DAC to Mixer"},



	{"Mixer to ADC", NULL, "Mixer"},

	{"ADC Source", "Mixer", "Mixer to ADC"},

	{"ADC Source", "Line In", "Line In"},

	{"ADC Source", "Mic 1", "Mic 1"},

	{"ADC Source", "Mic 2", "Mic 2"},

	{"ADC", NULL, "ADC Source"},

	{"ADC Source Capture Route", "Mixer", "Mixer to ADC"},

	{"ADC Sourc Capture Routee", "Line In", "Line In"},

	{"ADC Source Capture Route", "Mic 1", "Mic 1"},

	{"ADC Source Capture Route", "Mic 2", "Mic 2"},

	{"ADC", NULL, "ADC Source Capture Route"},



	{"Out Stage", NULL, "Mixer"},

	{"HP Out", NULL, "Out Stage"},