diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 11:28:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 11:28:19 +0000 |
| commit | 70a28f841d6744c53320c789c2603ac4318649b2 (patch) | |
| tree | d741cae5dc81bc37bbb05134a453cd099262dac5 /sound/soc/codecs/wm8962.c | |
| parent | 5786b6622112ab582c0bf05d6e722ed12a07642f (diff) | |
| parent | 1d9a91db923d73707538121b65f4e24e91dcbd2d (diff) | |
| download | linux-3.10-70a28f841d6744c53320c789c2603ac4318649b2.tar.gz linux-3.10-70a28f841d6744c53320c789c2603ac4318649b2.tar.bz2 linux-3.10-70a28f841d6744c53320c789c2603ac4318649b2.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 2ae04ba4ab6..48b5c95a064 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1975,7 +1975,7 @@ static int wm8962_reset(struct wm8962_priv *wm8962) static const DECLARE_TLV_DB_SCALE(inpga_tlv, -2325, 75, 0); static const DECLARE_TLV_DB_SCALE(mixin_tlv, -1500, 300, 0); static const unsigned int mixinpga_tlv[] = { - TLV_DB_RANGE_HEAD(7), + TLV_DB_RANGE_HEAD(5), 0, 1, TLV_DB_SCALE_ITEM(0, 600, 0), 2, 2, TLV_DB_SCALE_ITEM(1300, 1300, 0), 3, 4, TLV_DB_SCALE_ITEM(1800, 200, 0), @@ -1990,7 +1990,7 @@ static const DECLARE_TLV_DB_SCALE(bypass_tlv, -1500, 300, 0); static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1); static const DECLARE_TLV_DB_SCALE(hp_tlv, -700, 100, 0); static const unsigned int classd_tlv[] = { - TLV_DB_RANGE_HEAD(7), + TLV_DB_RANGE_HEAD(2), 0, 6, TLV_DB_SCALE_ITEM(0, 150, 0), 7, 7, TLV_DB_SCALE_ITEM(1200, 0, 0), }; |