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

Commit 77088cc9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 6759dc32 ed3e80c4

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5648,7 +5648,6 @@ F: drivers/media/video/*7146* 
F:	include/media/*7146*



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Jassi Brar <jassisinghbrar@gmail.com>

M:	Sangbeom Kim <sbkim73@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

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

};