Merge branch 'for-2.6.34' into for-2.6.35 (4ca612eb) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/codecs/tlv320dac33.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@ static int dac33_prepare_chip(struct snd_pcm_substream *substream)
		if (dac33->fifo_mode) {
		/* Generic for all FIFO modes */
		/* 50-51 : ASRC Control registers */
		dac33_write(codec, DAC33_ASRC_CTRL_A, (1 << 4)); /* div=2 */
		dac33_write(codec, DAC33_ASRC_CTRL_A, DAC33_SRCLKDIV(1));
		dac33_write(codec, DAC33_ASRC_CTRL_B, 1); /* ??? */

		/* Write registers 0x34 and 0x35 (MSB, LSB) */
		@@ -1028,11 +1028,7 @@ static int dac33_set_dai_fmt(struct snd_soc_dai *codec_dai,
		case SND_SOC_DAIFMT_DSP_A:
		aictrl_a \|= DAC33_AFMT_DSP;
		aictrl_b &= ~DAC33_DATA_DELAY_MASK;
		aictrl_b \|= DAC33_DATA_DELAY(1); /* 1 bit delay */
		break;
		case SND_SOC_DAIFMT_DSP_B:
		aictrl_a \|= DAC33_AFMT_DSP;
		aictrl_b &= ~DAC33_DATA_DELAY_MASK; /* No delay */
		aictrl_b \|= DAC33_DATA_DELAY(0);
		break;
		case SND_SOC_DAIFMT_RIGHT_J:
		aictrl_a \|= DAC33_AFMT_RIGHT_J;
		@@ -1056,7 +1052,7 @@ static void dac33_init_chip(struct snd_soc_codec *codec)
		{
		/* 44-46: DAC Control Registers */
		/* A : DAC sample rate Fsref/1.5 */
		dac33_write(codec, DAC33_DAC_CTRL_A, DAC33_DACRATE(1));
		dac33_write(codec, DAC33_DAC_CTRL_A, DAC33_DACRATE(0));
		/* B : DAC src=normal, not muted */
		dac33_write(codec, DAC33_DAC_CTRL_B, DAC33_DACSRCR_RIGHT \|
		DAC33_DACSRCL_LEFT);

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec)
		msleep(1);
		reg = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_0);
		dev_dbg(codec->dev, "DC servo: %x\n", reg);
		} while (reg & WM8993_DCS_DATAPATH_BUSY);
		} while (reg & WM8993_DCS_DATAPATH_BUSY && count < 400);

		if (reg & WM8993_DCS_DATAPATH_BUSY)
		dev_err(codec->dev, "Timed out waiting for DC Servo\n");

+1 −0