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

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

Merge branch 'fix/asoc' into for-linus

parents 1c583063 3cc4e53f

sound/arm/pxa2xx-pcm-lib.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream) 
	if (!rtd->dma_desc_array)

		goto err1;



	rtd->dma_ch = -1;

	runtime->private_data = rtd;

	return 0;

sound/soc/codecs/tlv320dac33.c

+3 −7
Original line number Diff line number Diff line
@@ -778,7 +778,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) */
@@ -1038,11 +1038,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;
@@ -1066,7 +1062,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);

sound/soc/codecs/wm_hubs.c

+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");

sound/soc/imx/Kconfig

+1 −1
Original line number Diff line number Diff line 
config SND_IMX_SOC

	tristate "SoC Audio for Freescale i.MX CPUs"

	depends on ARCH_MXC && BROKEN

	depends on ARCH_MXC

	select SND_PCM

	select FIQ

	select SND_SOC_AC97_BUS

sound/soc/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ config SND_SOC_SH4_SIU 
	select DMA_ENGINE

	select DMADEVICES

	select SH_DMAE

	select FW_LOADER



##

## Boards