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

Commit 48519f0a authored by Sekhar Nori's avatar Sekhar Nori Committed by Mark Brown
Browse files

ASoC: davinci: let platform data define edma queue numbers 



Currently the EDMA queue to be used by for servicing ASP through
internal RAM is fixed to EDMAQ_0 and that to service internal RAM
from external RAM is fixed to EDMAQ_1.

This may not be the desirable configuration on all platforms. For
example, on DM365, queue 0 has large fifo size and is more suitable
for video transfers. Having audio and video transfers on the same
queue may lead to starvation on audio side.

platform data as defined currently passes a queue number to the driver
but that remains unused inside the driver.

Fix this by defining one queue each for ASP and RAM transfers in the
platform data and using it inside the driver.

Since EDMAQ_0 maps to 0, thats the queue that will be used if
the asp queue number is not initialized. None of the platforms
currently utilize ping-pong transfers through internal RAM so that
functionality remains unchanged too.

This patch has been tested on DM644x and OMAP-L138 EVMs.

Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5c519767

arch/arm/mach-davinci/board-da830-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static struct snd_platform_data da830_evm_snd_data = { 
	.num_serializer = ARRAY_SIZE(da830_iis_serializer_direction),

	.tdm_slots      = 2,

	.serial_dir     = da830_iis_serializer_direction,

	.eventq_no      = EVENTQ_0,

	.asp_chan_q     = EVENTQ_0,

	.version	= MCASP_VERSION_2,

	.txnumevt	= 1,

	.rxnumevt	= 1,

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static struct snd_platform_data da850_evm_snd_data = { 
	.num_serializer	= ARRAY_SIZE(da850_iis_serializer_direction),

	.tdm_slots	= 2,

	.serial_dir	= da850_iis_serializer_direction,

	.eventq_no	= EVENTQ_1,

	.asp_chan_q	= EVENTQ_1,

	.version	= MCASP_VERSION_2,

	.txnumevt	= 1,

	.rxnumevt	= 1,

arch/arm/mach-davinci/board-dm646x-evm.c

+2 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = { 
		.num_serializer = ARRAY_SIZE(dm646x_iis_serializer_direction),

		.tdm_slots      = 2,

		.serial_dir     = dm646x_iis_serializer_direction,

		.eventq_no      = EVENTQ_0,

		.asp_chan_q     = EVENTQ_0,

	},

	{

		.tx_dma_offset  = 0x400,
@@ -332,7 +332,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = { 
		.num_serializer = ARRAY_SIZE(dm646x_dit_serializer_direction),

		.tdm_slots      = 32,

		.serial_dir     = dm646x_dit_serializer_direction,

		.eventq_no      = EVENTQ_0,

		.asp_chan_q     = EVENTQ_0,

	},

};

arch/arm/mach-davinci/include/mach/asp.h

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ 
struct snd_platform_data {

	u32 tx_dma_offset;

	u32 rx_dma_offset;

	enum dma_event_q eventq_no;	/* event queue number */

	enum dma_event_q asp_chan_q;	/* event queue number for ASP channel */

	enum dma_event_q ram_chan_q;	/* event queue number for RAM channel */

	unsigned int codec_fmt;

	/*

	 * Allowing this is more efficient and eliminates left and right swaps

sound/soc/davinci/davinci-i2s.c

+10 −0
Original line number Diff line number Diff line
@@ -648,6 +648,8 @@ static int davinci_i2s_probe(struct platform_device *pdev) 
	struct snd_platform_data *pdata = pdev->dev.platform_data;

	struct davinci_mcbsp_dev *dev;

	struct resource *mem, *ioarea, *res;

	enum dma_event_q asp_chan_q = EVENTQ_0;

	enum dma_event_q ram_chan_q = EVENTQ_1;

	int ret;



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -676,7 +678,15 @@ static int davinci_i2s_probe(struct platform_device *pdev) 
			pdata->sram_size_capture;

		dev->clk_input_pin = pdata->clk_input_pin;

		dev->i2s_accurate_sck = pdata->i2s_accurate_sck;

		asp_chan_q = pdata->asp_chan_q;

		ram_chan_q = pdata->ram_chan_q;

	}



	dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].asp_chan_q	= asp_chan_q;

	dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].ram_chan_q	= ram_chan_q;

	dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].asp_chan_q	= asp_chan_q;

	dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].ram_chan_q	= ram_chan_q;



	dev->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(dev->clk)) {

		ret = -ENODEV;