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

Commit 70a28f84 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 5786b662 1d9a91db

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/cs4271.c

+5 −3
Original line number Diff line number Diff line
@@ -434,7 +434,8 @@ static int cs4271_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg) 
{

	int ret;

	/* Set power-down bit */

	ret = snd_soc_update_bits(codec, CS4271_MODE2, 0, CS4271_MODE2_PDN);

	ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN,

				  CS4271_MODE2_PDN);

	if (ret < 0)

		return ret;

	return 0;
@@ -501,7 +502,8 @@ static int cs4271_probe(struct snd_soc_codec *codec) 
		return ret;

	}



	ret = snd_soc_update_bits(codec, CS4271_MODE2, 0,

	ret = snd_soc_update_bits(codec, CS4271_MODE2,

				  CS4271_MODE2_PDN | CS4271_MODE2_CPEN,

				  CS4271_MODE2_PDN | CS4271_MODE2_CPEN);

	if (ret < 0)

		return ret;

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
@@ -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),

};