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

Commit e3c7dbb0 authored by Lopez Cruz, Misael's avatar Lopez Cruz, Misael Committed by Mark Brown
Browse files

ASoC: Remove word "Switch" from Handsfree switch name 



SoC dapm adds the suffix "Switch" to SND_SOC_DAPM_SWITCH controls,
removing word "Switch" from HandsfreeL/HandsfreeR widget name
for avoiding to duplicate it.

Signed-off-by: default avatarMisael Lopez Cruz <x0052729@ti.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 647613e9

sound/soc/codecs/twl4030.c

+6 −6
Original line number Diff line number Diff line
@@ -1258,14 +1258,14 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 
	/* HandsfreeL/R */

	SND_SOC_DAPM_MUX("HandsfreeL Mux", SND_SOC_NOPM, 0, 0,

		&twl4030_dapm_handsfreel_control),

	SND_SOC_DAPM_SWITCH("HandsfreeL Switch", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SWITCH("HandsfreeL", SND_SOC_NOPM, 0, 0,

			&twl4030_dapm_handsfreelmute_control),

	SND_SOC_DAPM_PGA_E("HandsfreeL PGA", SND_SOC_NOPM,

			0, 0, NULL, 0, handsfreelpga_event,

			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MUX("HandsfreeR Mux", SND_SOC_NOPM, 5, 0,

		&twl4030_dapm_handsfreer_control),

	SND_SOC_DAPM_SWITCH("HandsfreeR Switch", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SWITCH("HandsfreeR", SND_SOC_NOPM, 0, 0,

			&twl4030_dapm_handsfreermute_control),

	SND_SOC_DAPM_PGA_E("HandsfreeR PGA", SND_SOC_NOPM,

			0, 0, NULL, 0, handsfreerpga_event,
@@ -1377,15 +1377,15 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"HandsfreeL Mux", "AudioL1", "Analog L1 Playback Mixer"},

	{"HandsfreeL Mux", "AudioL2", "Analog L2 Playback Mixer"},

	{"HandsfreeL Mux", "AudioR2", "Analog R2 Playback Mixer"},

	{"HandsfreeL Switch", "Switch", "HandsfreeL Mux"},

	{"HandsfreeL PGA", NULL, "HandsfreeL Switch"},

	{"HandsfreeL", "Switch", "HandsfreeL Mux"},

	{"HandsfreeL PGA", NULL, "HandsfreeL"},

	/* HandsfreeR */

	{"HandsfreeR Mux", "Voice", "Analog Voice Playback Mixer"},

	{"HandsfreeR Mux", "AudioR1", "Analog R1 Playback Mixer"},

	{"HandsfreeR Mux", "AudioR2", "Analog R2 Playback Mixer"},

	{"HandsfreeR Mux", "AudioL2", "Analog L2 Playback Mixer"},

	{"HandsfreeR Switch", "Switch", "HandsfreeR Mux"},

	{"HandsfreeR PGA", NULL, "HandsfreeR Switch"},

	{"HandsfreeR", "Switch", "HandsfreeR Mux"},

	{"HandsfreeR PGA", NULL, "HandsfreeR"},

	/* Vibra */

	{"Vibra Mux", "AudioL1", "DAC Left1"},

	{"Vibra Mux", "AudioR1", "DAC Right1"},