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

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

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

parents aaa36d3a 989ff775

sound/soc/omap/mcbsp.c

+8 −0
Original line number Diff line number Diff line
@@ -260,6 +260,10 @@ static void omap_st_on(struct omap_mcbsp *mcbsp) 
	if (mcbsp->pdata->enable_st_clock)

		mcbsp->pdata->enable_st_clock(mcbsp->id, 1);



	/* Disable Sidetone clock auto-gating for normal operation */

	w = MCBSP_ST_READ(mcbsp, SYSCONFIG);

	MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w & ~(ST_AUTOIDLE));



	/* Enable McBSP Sidetone */

	w = MCBSP_READ(mcbsp, SSELCR);

	MCBSP_WRITE(mcbsp, SSELCR, w | SIDETONEEN);
@@ -279,6 +283,10 @@ static void omap_st_off(struct omap_mcbsp *mcbsp) 
	w = MCBSP_READ(mcbsp, SSELCR);

	MCBSP_WRITE(mcbsp, SSELCR, w & ~(SIDETONEEN));



	/* Enable Sidetone clock auto-gating to reduce power consumption */

	w = MCBSP_ST_READ(mcbsp, SYSCONFIG);

	MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w | ST_AUTOIDLE);



	if (mcbsp->pdata->enable_st_clock)

		mcbsp->pdata->enable_st_clock(mcbsp->id, 0);

}

sound/soc/omap/omap-pcm.c

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream, 
	struct dma_chan *chan;

	int err = 0;



	memset(&config, 0x00, sizeof(config));



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



	/* return if this is a bufferless transfer e.g.