[alsa-devel] [PATCH 1/2] ASoC: TWL4030: Fix for capture mixer strings

[Mark Brown]

On Thu, Aug 13, 2009 at 03:59:33PM +0300, Peter Ujfalusi wrote:

>  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 Route",
> +			TWL4030_REG_ANAMICL, 0, 1, 0),
> +	SOC_DAPM_SINGLE("Headset mic Capture Route",
> +			TWL4030_REG_ANAMICL, 1, 1, 0),
> +	SOC_DAPM_SINGLE("AUXL Capture Route",
> +			TWL4030_REG_ANAMICL, 2, 1, 0),
> +	SOC_DAPM_SINGLE("Carkit mic Capture Route",
> +			TWL4030_REG_ANAMICL, 3, 1, 0),

These should really be "foo Switch" - a switch is an on/off control.  If
there's a volume control associated with the path then alsamixer will
show the pair as a combined volume/mute control if they have the same
name but with Volume and Switch as the last word.

I'd also spell "mic" "Mic".