]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ASoC: TWL4030: Change the capture volume control to TLV
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>
Mon, 1 Dec 2008 08:03:45 +0000 (10:03 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 1 Dec 2008 19:58:52 +0000 (19:58 +0000)
The digital Capture gain control has a range:
0 to 31 dB in 1 dB steps.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/twl4030.c

index f3e9e591b52fb90f6cfc4705789bab97b02f5eb8..4b7a2d173a4a525adc85a59f2a16aac9acc254bd 100644 (file)
@@ -360,6 +360,12 @@ static DECLARE_TLV_DB_SCALE(master_tlv, -6300, 100, 1);
  */
 static DECLARE_TLV_DB_SCALE(master_coarse_tlv, 0, 600, 0);
 
+/*
+ * Capture gain after the ADCs
+ * from 0 dB to 31 dB in 1 dB steps
+ */
+static DECLARE_TLV_DB_SCALE(digital_capture_tlv, 0, 100, 0);
+
 static const struct snd_kcontrol_new twl4030_snd_controls[] = {
        SOC_DOUBLE_R_TLV("Master Playback Volume",
                 TWL4030_REG_ARXL2PGA, TWL4030_REG_ARXR2PGA,
@@ -367,9 +373,11 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
        SOC_DOUBLE_R_TLV("Master PCM Playback Volume",
                 TWL4030_REG_ARXL2PGA, TWL4030_REG_ARXR2PGA,
                6, 0x2, 0, master_coarse_tlv),
-       SOC_DOUBLE_R("Capture Volume",
-                TWL4030_REG_ATXL1PGA, TWL4030_REG_ATXR1PGA,
-               0, 0x1f, 0),
+
+       /* Common capture gain controls */
+       SOC_DOUBLE_R_TLV("Capture Volume",
+               TWL4030_REG_ATXL1PGA, TWL4030_REG_ATXR1PGA,
+               0, 0x1f, 0, digital_capture_tlv),
 };
 
 /* add non dapm controls */