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

Commit f0fab494 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/omap' into asoc-next

parents 556d8b55 a92b5317

sound/soc/omap/omap-hdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream, 
	/*

	 * fill the IEC-60958 channel status word

	 */

	/* initialize the word bytes */

	memset(iec->status, 0, sizeof(iec->status));



	/* specify IEC-60958-3 (commercial use) */

	iec->status[0] &= ~IEC958_AES0_PROFESSIONAL;

sound/soc/omap/omap-pcm.c

+3 −11
Original line number Diff line number Diff line
@@ -174,23 +174,15 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream) 


static int omap_pcm_open(struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct omap_pcm_dma_data *dma_data;

	int ret;



	snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware);



	/* Ensure that buffer size is a multiple of period size */

	ret = snd_pcm_hw_constraint_integer(runtime,

					    SNDRV_PCM_HW_PARAM_PERIODS);

	if (ret < 0)

		return ret;



	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

	ret = snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,



	return snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,

				      &dma_data->dma_req);

	return ret;

}



static int omap_pcm_close(struct snd_pcm_substream *substream)