diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 15:28:19 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 15:28:19 +0400 |
commit | 70a28f841d6744c53320c789c2603ac4318649b2 (patch) | |
tree | d741cae5dc81bc37bbb05134a453cd099262dac5 /sound/soc/codecs/rt5631.c | |
parent | 5786b6622112ab582c0bf05d6e722ed12a07642f (diff) | |
parent | 1d9a91db923d73707538121b65f4e24e91dcbd2d (diff) | |
download | linux-70a28f841d6744c53320c789c2603ac4318649b2.tar.xz |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/rt5631.c')
-rw-r--r-- | sound/soc/codecs/rt5631.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index 27a078cbb6eb..4646e808b90a 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c @@ -177,7 +177,7 @@ static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -95625, 375, 0); static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); /* {0, +20, +24, +30, +35, +40, +44, +50, +52}dB */ static unsigned int mic_bst_tlv[] = { - TLV_DB_RANGE_HEAD(6), + TLV_DB_RANGE_HEAD(7), 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0), 1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0), 2, 2, TLV_DB_SCALE_ITEM(2400, 0, 0), |