Commit 381a22b5 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: TWL4030: Change the capture volume control to TLV 



The digital Capture gain control has a range:
0 to 31 dB in 1 dB steps.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fa5c7697

sound/soc/codecs/twl4030.c

+11 −3
Original line number Diff line number Diff line
@@ -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",



	/* Common capture gain controls */

	SOC_DOUBLE_R_TLV("Capture Volume",

		TWL4030_REG_ATXL1PGA, TWL4030_REG_ATXR1PGA,

		0, 0x1f, 0),

		0, 0x1f, 0, digital_capture_tlv),

};



/* add non dapm controls */