[PATCH 0/1 - v2] ASoC: TWL4030: Capture mixer string changes

Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/1 - v2] ASoC: TWL4030: Capture mixer string changes
@ 2009-08-14  5:43 Peter Ujfalusi
  2009-08-14  5:44 ` [PATCH 1/1 - v2] ASoC: TWL4030: Fix for capture mixer strings Peter Ujfalusi
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Ujfalusi @ 2009-08-14  5:43 UTC (permalink / raw)
  To: alsa-devel; +Cc: sakoman, broonie

Hello,

Resending with the suggested changes:

Before the patch the analog capture path strings ended up like this at the end:
"Analog Left Capture Route Main mic Switch"
These switches showed up in the playback tab of alsamixer, which was not nice.
After the patch the strings will be like this:
"Analog Left Main Mic Capture Switch"
Which show up correctly in alsamixer as "Analog Left Main mic" under the
capture tab.

---
Peter Ujfalusi (1):
  ASoC: TWL4030: Fix for capture mixer strings

 sound/soc/codecs/twl4030.c |   46 +++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/1 - v2] ASoC: TWL4030: Fix for capture mixer strings
  2009-08-14  5:43 [PATCH 0/1 - v2] ASoC: TWL4030: Capture mixer string changes Peter Ujfalusi
@ 2009-08-14  5:44 ` Peter Ujfalusi
  2009-08-14 16:46   ` Mark Brown
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Ujfalusi @ 2009-08-14  5:44 UTC (permalink / raw)
  To: alsa-devel; +Cc: sakoman, broonie

Change the strings related to capture in order to be
interpreted correctly by alsamixer and possible other
UI based mixer applications.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
---
 sound/soc/codecs/twl4030.c |   46 +++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 1a65004..4df7c6c 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -399,16 +399,20 @@ SOC_DAPM_ENUM("Route", twl4030_vibrapath_enum);

 /* Left analog microphone selection */
 static const struct snd_kcontrol_new twl4030_dapm_analoglmic_controls[] = {
-	SOC_DAPM_SINGLE("Main mic", TWL4030_REG_ANAMICL, 0, 1, 0),
-	SOC_DAPM_SINGLE("Headset mic", TWL4030_REG_ANAMICL, 1, 1, 0),
-	SOC_DAPM_SINGLE("AUXL", TWL4030_REG_ANAMICL, 2, 1, 0),
-	SOC_DAPM_SINGLE("Carkit mic", TWL4030_REG_ANAMICL, 3, 1, 0),
+	SOC_DAPM_SINGLE("Main Mic Capture Switch",
+			TWL4030_REG_ANAMICL, 0, 1, 0),
+	SOC_DAPM_SINGLE("Headset Mic Capture Switch",
+			TWL4030_REG_ANAMICL, 1, 1, 0),
+	SOC_DAPM_SINGLE("AUXL Capture Switch",
+			TWL4030_REG_ANAMICL, 2, 1, 0),
+	SOC_DAPM_SINGLE("Carkit Mic Capture Switch",
+			TWL4030_REG_ANAMICL, 3, 1, 0),
 };

 /* Right analog microphone selection */
 static const struct snd_kcontrol_new twl4030_dapm_analogrmic_controls[] = {
-	SOC_DAPM_SINGLE("Sub mic", TWL4030_REG_ANAMICR, 0, 1, 0),
-	SOC_DAPM_SINGLE("AUXR", TWL4030_REG_ANAMICR, 2, 1, 0),
+	SOC_DAPM_SINGLE("Sub Mic Capture Switch", TWL4030_REG_ANAMICR, 0, 1, 0),
+	SOC_DAPM_SINGLE("AUXR Capture Switch", TWL4030_REG_ANAMICR, 2, 1, 0),
 };

 /* TX1 L/R Analog/Digital microphone selection */
@@ -1333,11 +1337,11 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
 		SND_SOC_DAPM_POST_REG),

 	/* Analog input mixers for the capture amplifiers */
-	SND_SOC_DAPM_MIXER("Analog Left Capture Route",
+	SND_SOC_DAPM_MIXER("Analog Left",
 		TWL4030_REG_ANAMICL, 4, 0,
 		&twl4030_dapm_analoglmic_controls[0],
 		ARRAY_SIZE(twl4030_dapm_analoglmic_controls)),
-	SND_SOC_DAPM_MIXER("Analog Right Capture Route",
+	SND_SOC_DAPM_MIXER("Analog Right",
 		TWL4030_REG_ANAMICR, 4, 0,
 		&twl4030_dapm_analogrmic_controls[0],
 		ARRAY_SIZE(twl4030_dapm_analogrmic_controls)),
@@ -1446,16 +1450,16 @@ static const struct snd_soc_dapm_route intercon[] = {
 	{"VIBRA", NULL, "Vibra Route"},

 	/* Capture path */
-	{"Analog Left Capture Route", "Main mic", "MAINMIC"},
-	{"Analog Left Capture Route", "Headset mic", "HSMIC"},
-	{"Analog Left Capture Route", "AUXL", "AUXL"},
-	{"Analog Left Capture Route", "Carkit mic", "CARKITMIC"},
+	{"Analog Left", "Main Mic Capture Switch", "MAINMIC"},
+	{"Analog Left", "Headset Mic Capture Switch", "HSMIC"},
+	{"Analog Left", "AUXL Capture Switch", "AUXL"},
+	{"Analog Left", "Carkit Mic Capture Switch", "CARKITMIC"},

-	{"Analog Right Capture Route", "Sub mic", "SUBMIC"},
-	{"Analog Right Capture Route", "AUXR", "AUXR"},
+	{"Analog Right", "Sub Mic Capture Switch", "SUBMIC"},
+	{"Analog Right", "AUXR Capture Switch", "AUXR"},

-	{"ADC Physical Left", NULL, "Analog Left Capture Route"},
-	{"ADC Physical Right", NULL, "Analog Right Capture Route"},
+	{"ADC Physical Left", NULL, "Analog Left"},
+	{"ADC Physical Right", NULL, "Analog Right"},

 	{"Digimic0 Enable", NULL, "DIGIMIC0"},
 	{"Digimic1 Enable", NULL, "DIGIMIC1"},
@@ -1479,11 +1483,11 @@ static const struct snd_soc_dapm_route intercon[] = {
 	{"ADC Virtual Right2", NULL, "TX2 Capture Route"},

 	/* Analog bypass routes */
-	{"Right1 Analog Loopback", "Switch", "Analog Right Capture Route"},
-	{"Left1 Analog Loopback", "Switch", "Analog Left Capture Route"},
-	{"Right2 Analog Loopback", "Switch", "Analog Right Capture Route"},
-	{"Left2 Analog Loopback", "Switch", "Analog Left Capture Route"},
-	{"Voice Analog Loopback", "Switch", "Analog Left Capture Route"},
+	{"Right1 Analog Loopback", "Switch", "Analog Right"},
+	{"Left1 Analog Loopback", "Switch", "Analog Left"},
+	{"Right2 Analog Loopback", "Switch", "Analog Right"},
+	{"Left2 Analog Loopback", "Switch", "Analog Left"},
+	{"Voice Analog Loopback", "Switch", "Analog Left"},

 	{"Analog R1 Playback Mixer", NULL, "Right1 Analog Loopback"},
 	{"Analog L1 Playback Mixer", NULL, "Left1 Analog Loopback"},
--
1.6.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1 - v2] ASoC: TWL4030: Fix for capture mixer strings
  2009-08-14  5:44 ` [PATCH 1/1 - v2] ASoC: TWL4030: Fix for capture mixer strings Peter Ujfalusi
@ 2009-08-14 16:46   ` Mark Brown
  0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2009-08-14 16:46 UTC (permalink / raw)
  To: Peter Ujfalusi; +Cc: sakoman, alsa-devel

On Fri, Aug 14, 2009 at 08:44:00AM +0300, Peter Ujfalusi wrote:
> Change the strings related to capture in order to be
> interpreted correctly by alsamixer and possible other
> UI based mixer applications.

> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-08-14 16:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-14  5:43 [PATCH 0/1 - v2] ASoC: TWL4030: Capture mixer string changes Peter Ujfalusi
2009-08-14  5:44 ` [PATCH 1/1 - v2] ASoC: TWL4030: Fix for capture mixer strings Peter Ujfalusi
2009-08-14 16:46   ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox