Skip to contentSkip to conversation

ASoC: cirrus: Enable compile test builds

PATCH In review Mark Brown 2 participants 5 messages Oct 19, 2013 – Oct 22, 2013

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

PATCH 1/2 ASoC: cirrus: Enable compile test builds

From: Mark Brown <[email protected]>

The core support for ep93xx (currently only the DMA driver) does not depend on the architecture at all and everything else has more strict dependencies so enable compile test builds for improved build coverage.

---
 sound/soc/cirrus/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/cirrus/Kconfig +1 -1
index 2c20f01..06f938d 100644
@@ -1,6 +1,6 @@
 config SND_EP93XX_SOC
 	tristate "SoC Audio support for the Cirrus Logic EP93xx series"
-	depends on ARCH_EP93XX && SND_SOC
+	depends on (ARCH_EP93XX || COMPILE_TEST) && SND_SOC
 	select SND_SOC_GENERIC_DMAENGINE_PCM
 	help
 	  Say Y or M if you want to add support for codecs attached to
Signature · 1 line
1.8.4.rc3
author maintainer
#1 lore raw

PATCH 2/2 ASoC: ep93xx: Open code dma channel request

From: Mark Brown <[email protected]>

Currently the ep93xx DMA code is one of the few users relying on the fact that the compat code uses the dma_data as the filter data for non-DT channel requests. Since the rest of the core expects this to be a struct snd_dmaengine_dai_data this isn't terribly helpful this will be changed to use the already existing filter data so avoid breaking ep93xx by open coding the current behaviour.

---
 sound/soc/cirrus/ep93xx-pcm.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
sound/soc/cirrus/ep93xx-pcm.c +13 -0
index 0e9f56e..cfe517e 100644
@@ -57,9 +57,22 @@ static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param)
 	return false;
 }
 
+static struct dma_chan *ep93xx_compat_request_channel(
+	struct snd_soc_pcm_runtime *rtd,
+	struct snd_pcm_substream *substream)
+{
+	struct snd_dmaengine_dai_dma_data *dma_data;
+
+	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
+	return snd_dmaengine_pcm_request_channel(ep93xx_pcm_dma_filter,
+						 dma_data);
+}
+
 static const struct snd_dmaengine_pcm_config ep93xx_dmaengine_pcm_config = {
 	.pcm_hardware = &ep93xx_pcm_hardware,
 	.compat_filter_fn = ep93xx_pcm_dma_filter,
+	.compat_request_channel = ep93xx_compat_request_channel,
 	.prealloc_buffer_size = 131072,
 };
 
Signature · 1 line
1.8.4.rc3
#2 lore raw

Re: [PATCH 2/2] ASoC: ep93xx: Open code dma channel request

On 10/19/2013 03:13 PM, Mark Brown wrote:
[...]

sound/soc/cirrus/ep93xx-pcm.c static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param) · line 74

Quoted 3 lines

static const struct snd_dmaengine_pcm_config ep93xx_dmaengine_pcm_config = {

sound/soc/cirrus/ep93xx-pcm.c +0 -0
 	.pcm_hardware = &ep93xx_pcm_hardware,
 	.compat_filter_fn = ep93xx_pcm_dma_filter,

The compat_filter_fn attribute should probably removed

sound/soc/cirrus/ep93xx-pcm.c static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param) · line 77

Quoted 3 lines
sound/soc/cirrus/ep93xx-pcm.c +1 -0
+	.compat_request_channel = ep93xx_compat_request_channel,
 	.prealloc_buffer_size = 131072,
 };

Otherwise it looks fine

author maintainer
#3 lore raw

Re: [PATCH 2/2] ASoC: ep93xx: Open code dma channel request

Quoted 7 lines · Lars-Peter Clausen

On 10/19/2013 03:13 PM, Mark Brown wrote:
[...]

sound/soc/cirrus/ep93xx-pcm.c static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param) · line 74

Quoted 3 lines

static const struct snd_dmaengine_pcm_config ep93xx_dmaengine_pcm_config = {

sound/soc/cirrus/ep93xx-pcm.c +0 -0
 	.pcm_hardware = &ep93xx_pcm_hardware,
 	.compat_filter_fn = ep93xx_pcm_dma_filter,

The compat_filter_fn attribute should probably removed

Yeah, I was in two minds about that. Obviously the ideal thing is to change the drivers so they can use the filter function again; from that point of view it's kind of like what's going on with Tegra in intention
- it is notionaly using the filter function, it's just that the DAIs are putting the data in the wrong place at the minute.

#4 lore raw

Re: [PATCH 2/2] ASoC: ep93xx: Open code dma channel request

Quoted 7 lines · Mark Brown
Quoted 5 lines · Lars-Peter Clausen

On 10/19/2013 03:13 PM, Mark Brown wrote:
[...]

Quoted 3 lines

static const struct snd_dmaengine_pcm_config ep93xx_dmaengine_pcm_config = {

sound/soc/cirrus/ep93xx-pcm.c +0 -0
 	.pcm_hardware = &ep93xx_pcm_hardware,
 	.compat_filter_fn = ep93xx_pcm_dma_filter,
Quoted 7 lines
Quoted 1 line

The compat_filter_fn attribute should probably removed

Yeah, I was in two minds about that. Obviously the ideal thing is to change the drivers so they can use the filter function again; from that point of view it's kind of like what's going on with Tegra in intention
- it is notionaly using the filter function, it's just that the DAIs are putting the data in the wrong place at the minute.

Ok.