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

Commit abfe69dd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.13-4' of... 

Merge tag 'asoc-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.13

A few fixes in drivers, the i.MX and wm8962 fixes are for a pretty nasty
issues for users of those drivers if they run into them.
parents d009f3de a190f786

sound/soc/blackfin/bf5xx-i2s.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream, 
		bf5xx_i2s->tcr2 |= 7;

		bf5xx_i2s->tcr2 |= 7;

		bf5xx_i2s->rcr2 |= 7;

		bf5xx_i2s->rcr2 |= 7;

		sport_handle->wdsize = 1;

		sport_handle->wdsize = 1;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

	case SNDRV_PCM_FORMAT_S16_LE:

		bf5xx_i2s->tcr2 |= 15;

		bf5xx_i2s->tcr2 |= 15;

		bf5xx_i2s->rcr2 |= 15;

		bf5xx_i2s->rcr2 |= 15;

sound/soc/codecs/cs42l52.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ 
#define CS42L52_MICB_CTL			0x11

#define CS42L52_MICB_CTL			0x11

#define	CS42L52_MIC_CTL_MIC_SEL_MASK		0xBF

#define	CS42L52_MIC_CTL_MIC_SEL_MASK		0xBF

#define	CS42L52_MIC_CTL_MIC_SEL_SHIFT		6

#define	CS42L52_MIC_CTL_MIC_SEL_SHIFT		6

#define CS42L52_MIC_CTL_TYPE_MASK		0xDF

#define CS42L52_MIC_CTL_TYPE_MASK		0x20

#define CS42L52_MIC_CTL_TYPE_SHIFT		5

#define CS42L52_MIC_CTL_TYPE_SHIFT		5

sound/soc/codecs/wm5102.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -685,13 +685,13 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("EQ4", ARIZONA_EQ4MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("EQ4", ARIZONA_EQ4MIX_INPUT_1_SOURCE),





SND_SOC_BYTES_MASK("EQ1 Coefficeints", ARIZONA_EQ1_1, 21,

SND_SOC_BYTES_MASK("EQ1 Coefficients", ARIZONA_EQ1_1, 21,

		   ARIZONA_EQ1_ENA_MASK),

		   ARIZONA_EQ1_ENA_MASK),

SND_SOC_BYTES_MASK("EQ2 Coefficeints", ARIZONA_EQ2_1, 21,

SND_SOC_BYTES_MASK("EQ2 Coefficients", ARIZONA_EQ2_1, 21,

		   ARIZONA_EQ2_ENA_MASK),

		   ARIZONA_EQ2_ENA_MASK),

SND_SOC_BYTES_MASK("EQ3 Coefficeints", ARIZONA_EQ3_1, 21,

SND_SOC_BYTES_MASK("EQ3 Coefficients", ARIZONA_EQ3_1, 21,

		   ARIZONA_EQ3_ENA_MASK),

		   ARIZONA_EQ3_ENA_MASK),

SND_SOC_BYTES_MASK("EQ4 Coefficeints", ARIZONA_EQ4_1, 21,

SND_SOC_BYTES_MASK("EQ4 Coefficients", ARIZONA_EQ4_1, 21,

		   ARIZONA_EQ4_ENA_MASK),

		   ARIZONA_EQ4_ENA_MASK),





SOC_SINGLE_TLV("EQ1 B1 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B1_GAIN_SHIFT,

SOC_SINGLE_TLV("EQ1 B1 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B1_GAIN_SHIFT,

sound/soc/codecs/wm5110.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -101,13 +101,13 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("EQ4", ARIZONA_EQ4MIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("EQ4", ARIZONA_EQ4MIX_INPUT_1_SOURCE),





SND_SOC_BYTES_MASK("EQ1 Coefficeints", ARIZONA_EQ1_1, 21,

SND_SOC_BYTES_MASK("EQ1 Coefficients", ARIZONA_EQ1_1, 21,

		   ARIZONA_EQ1_ENA_MASK),

		   ARIZONA_EQ1_ENA_MASK),

SND_SOC_BYTES_MASK("EQ2 Coefficeints", ARIZONA_EQ2_1, 21,

SND_SOC_BYTES_MASK("EQ2 Coefficients", ARIZONA_EQ2_1, 21,

		   ARIZONA_EQ2_ENA_MASK),

		   ARIZONA_EQ2_ENA_MASK),

SND_SOC_BYTES_MASK("EQ3 Coefficeints", ARIZONA_EQ3_1, 21,

SND_SOC_BYTES_MASK("EQ3 Coefficients", ARIZONA_EQ3_1, 21,

		   ARIZONA_EQ3_ENA_MASK),

		   ARIZONA_EQ3_ENA_MASK),

SND_SOC_BYTES_MASK("EQ4 Coefficeints", ARIZONA_EQ4_1, 21,

SND_SOC_BYTES_MASK("EQ4 Coefficients", ARIZONA_EQ4_1, 21,

		   ARIZONA_EQ4_ENA_MASK),

		   ARIZONA_EQ4_ENA_MASK),





SOC_SINGLE_TLV("EQ1 B1 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B1_GAIN_SHIFT,

SOC_SINGLE_TLV("EQ1 B1 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B1_GAIN_SHIFT,

sound/soc/codecs/wm8962.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -3728,6 +3728,8 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, 
	if (ret < 0)

	if (ret < 0)

		goto err_enable;

		goto err_enable;





	regcache_cache_only(wm8962->regmap, true);



	/* The drivers should power up as needed */

	/* The drivers should power up as needed */

	regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);

	regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);