Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d9a91db authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'DB_RANGE-size-fixes' of git://git.alsa-project.org/alsa-kprivate into for-3.2

parents ef0cd470 028aa634

sound/soc/codecs/adau1373.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static const char *adau1373_bass_hpf_cutoff_text[] = { 
};



static const unsigned int adau1373_bass_tlv[] = {

	TLV_DB_RANGE_HEAD(4),

	TLV_DB_RANGE_HEAD(3),

	0, 2, TLV_DB_SCALE_ITEM(-600, 600, 1),

	3, 4, TLV_DB_SCALE_ITEM(950, 250, 0),

	5, 7, TLV_DB_SCALE_ITEM(1400, 150, 0),

sound/soc/codecs/rt5631.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

sound/soc/codecs/sgtl5000.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static const DECLARE_TLV_DB_SCALE(capture_6db_attenuate, -600, 600, 0); 


/* tlv for mic gain, 0db 20db 30db 40db */

static const unsigned int mic_gain_tlv[] = {

	TLV_DB_RANGE_HEAD(4),

	TLV_DB_RANGE_HEAD(2),

	0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),

	1, 3, TLV_DB_SCALE_ITEM(2000, 1000, 0),

};

sound/soc/codecs/wm8962.c

+2 −2
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ static int wm8962_reset(struct snd_soc_codec *codec) 
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),
@@ -1988,7 +1988,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),

};

sound/soc/codecs/wm8993.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static const DECLARE_TLV_DB_SCALE(drc_comp_threash, -4500, 75, 0); 
static const DECLARE_TLV_DB_SCALE(drc_comp_amp, -2250, 75, 0);

static const DECLARE_TLV_DB_SCALE(drc_min_tlv, -1800, 600, 0);

static const unsigned int drc_max_tlv[] = {

	TLV_DB_RANGE_HEAD(4),

	TLV_DB_RANGE_HEAD(2),

	0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0),

	3, 3, TLV_DB_SCALE_ITEM(3600, 0, 0),

};