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

Commit 477adb06 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents c358e640 20a4e7fc

sound/soc/codecs/wm_hubs.c

+7 −8
Original line number 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)

{

	struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);

	s8 offset;

	u16 reg, reg_l, reg_r, dcs_cfg;



	/* 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);



		/* HPOUT1L */

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

		    reg_l + hubs->dcs_codes < 0xff)

			reg_l += hubs->dcs_codes;

		dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT;

		offset = reg_l;

		offset += hubs->dcs_codes;

		dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;



		/* HPOUT1R */

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

		    reg_r + hubs->dcs_codes < 0xff)

			reg_r += hubs->dcs_codes;

		dcs_cfg |= reg_r;

		offset = reg_r;

		offset += hubs->dcs_codes;

		dcs_cfg |= (u8)offset;



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

sound/soc/davinci/davinci-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = { 
	.stream_name = "AIC3X",

	.cpu_dai_name= "davinci-mcasp.0",

	.codec_dai_name = "tlv320aic3x-hifi",

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

	.codec_name = "tlv320aic3x-codec.1-0018",

	.platform_name = "davinci-pcm-audio",

	.init = evm_aic3x_init,

	.ops = &evm_ops,