From b44d3fd102e5062fd66d944be9a3c51ba0384c37 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 13 Oct 2010 11:56:28 +0300 Subject: [PATCH] --- yaml --- r: 216655 b: refs/heads/master c: cf4bb69884c8f6a5791e0e251f0b9dc5d32fc256 h: refs/heads/master i: 216653: 9cb0ddab2aa7b151e65b1de6ab65a7490180838a 216651: f7fd1fa7970dd95969d2e6d11ff8a66c85e24641 216647: 6d5765db2beadc5fe455456d990ad0cefdfd9d63 216639: 53eb62dbcc79eb98e7028ffb0aba09196ae717cf v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/tlv320dac33.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f5fa29a8ebde..d919aeffe230 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec588ae6c21ae20a22ce13a287728a220935b8ee +refs/heads/master: cf4bb69884c8f6a5791e0e251f0b9dc5d32fc256 diff --git a/trunk/sound/soc/codecs/tlv320dac33.c b/trunk/sound/soc/codecs/tlv320dac33.c index bf6d01f4a45a..58349dcd1a6e 100644 --- a/trunk/sound/soc/codecs/tlv320dac33.c +++ b/trunk/sound/soc/codecs/tlv320dac33.c @@ -524,6 +524,22 @@ static const struct soc_enum dac33_fifo_mode_enum = SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(dac33_fifo_mode_texts), dac33_fifo_mode_texts); +/* L/R Line Output Gain */ +static const char *lr_lineout_gain_texts[] = { + "Line -12dB DAC 0dB", "Line -6dB DAC 6dB", + "Line 0dB DAC 12dB", "Line 6dB DAC 18dB", +}; + +static const struct soc_enum l_lineout_gain_enum = + SOC_ENUM_SINGLE(DAC33_LDAC_PWR_CTRL, 0, + ARRAY_SIZE(lr_lineout_gain_texts), + lr_lineout_gain_texts); + +static const struct soc_enum r_lineout_gain_enum = + SOC_ENUM_SINGLE(DAC33_RDAC_PWR_CTRL, 0, + ARRAY_SIZE(lr_lineout_gain_texts), + lr_lineout_gain_texts); + /* * DACL/R digital volume control: * from 0 dB to -63.5 in 0.5 dB steps @@ -541,6 +557,8 @@ static const struct snd_kcontrol_new dac33_snd_controls[] = { DAC33_LDAC_DIG_VOL_CTRL, DAC33_RDAC_DIG_VOL_CTRL, 7, 1, 1), SOC_DOUBLE_R("Line to Line Out Volume", DAC33_LINEL_TO_LLO_VOL, DAC33_LINER_TO_RLO_VOL, 0, 127, 1), + SOC_ENUM("Left Line Output Gain", l_lineout_gain_enum), + SOC_ENUM("Right Line Output Gain", r_lineout_gain_enum), }; static const struct snd_kcontrol_new dac33_mode_snd_controls[] = {