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

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

Merge branch 'fix/asoc' into for-linus

parents ded9f523 a3adfa00

sound/soc/atmel/snd-soc-afeb9260.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = { 
	.cpu_dai_name = "atmel-ssc-dai.0",

	.cpu_dai_name = "atmel-ssc-dai.0",

	.codec_dai_name = "tlv320aic23-hifi",

	.codec_dai_name = "tlv320aic23-hifi",

	.platform_name = "atmel_pcm-audio",

	.platform_name = "atmel_pcm-audio",

	.codec_name = "tlv320aic23-codec.0-0x1a",

	.codec_name = "tlv320aic23-codec.0-001a",

	.init = afeb9260_tlv320aic23_init,

	.init = afeb9260_tlv320aic23_init,

	.ops = &afeb9260_ops,

	.ops = &afeb9260_ops,

};

};

sound/soc/blackfin/bf5xx-ssm2602.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = { 
	.cpu_dai_name = "bf5xx-i2s",

	.cpu_dai_name = "bf5xx-i2s",

	.codec_dai_name = "ssm2602-hifi",

	.codec_dai_name = "ssm2602-hifi",

	.platform_name = "bf5xx-pcm-audio",

	.platform_name = "bf5xx-pcm-audio",

	.codec_name = "ssm2602-codec.0-0x1b",

	.codec_name = "ssm2602-codec.0-001b",

	.ops = &bf5xx_ssm2602_ops,

	.ops = &bf5xx_ssm2602_ops,

};

};

sound/soc/codecs/wm8994.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate) 
	else

	else

		val = 0;

		val = 0;





	return snd_soc_update_bits(codec, reg, mask, reg);

	return snd_soc_update_bits(codec, reg, mask, val);

}

}





#define WM8994_RATES SNDRV_PCM_RATE_8000_96000

#define WM8994_RATES SNDRV_PCM_RATE_8000_96000

sound/soc/codecs/wm8995.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1223,7 +1223,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate) 
	else

	else

		val = 0;

		val = 0;





	return snd_soc_update_bits(codec, reg, mask, reg);

	return snd_soc_update_bits(codec, reg, mask, val);

}

}





/* The size in bits of the FLL divide multiplied by 10

/* The size in bits of the FLL divide multiplied by 10

sound/soc/codecs/wm_hubs.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) 
static void calibrate_dc_servo(struct snd_soc_codec *codec)

static void calibrate_dc_servo(struct snd_soc_codec *codec)

{

{

	struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);

	struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);

	s8 offset;

	u16 reg, reg_l, reg_r, dcs_cfg;

	u16 reg, reg_l, reg_r, dcs_cfg;





	/* If we're using a digital only path and have a previously

	/* If we're using a digital only path and have a previously
@@ -149,16 +150,14 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) 
			hubs->dcs_codes);

			hubs->dcs_codes);





		/* HPOUT1L */

		/* HPOUT1L */

		if (reg_l + hubs->dcs_codes > 0 &&

		offset = reg_l;

		    reg_l + hubs->dcs_codes < 0xff)

		offset += hubs->dcs_codes;

			reg_l += hubs->dcs_codes;

		dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;

		dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT;





		/* HPOUT1R */

		/* HPOUT1R */

		if (reg_r + hubs->dcs_codes > 0 &&

		offset = reg_r;

		    reg_r + hubs->dcs_codes < 0xff)

		offset += hubs->dcs_codes;

			reg_r += hubs->dcs_codes;

		dcs_cfg |= (u8)offset;

		dcs_cfg |= reg_r;





		dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg);

		dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg);