ASoC: samsung: s3c24{xx,12}-i2s: port to use generic dmaengine API
Subsystems (4)
PATCH RESEND v2 1/2 ASoC: samsung: s3c24{xx,12}-i2s: port to use generic dmaengine API
Use dmaengine instead of legacy s3c24xx DMA API for s3c24xx and s3c2412
---
v2: use hardcoded dma channel number
sound/soc/samsung/Kconfig | 9 +++---- sound/soc/samsung/dmaengine.c | 3 +++ sound/soc/samsung/s3c-i2s-v2.c | 17 +------------ sound/soc/samsung/s3c2412-i2s.c | 47 +++++++++++++++++----------------- sound/soc/samsung/s3c24xx-i2s.c | 56 +++++++++++++++++++---------------------- 5 files changed, 56 insertions(+), 76 deletions(-)
sound/soc/samsung/Kconfig +3 -6
@@ -1,11 +1,10 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" depends on PLAT_SAMSUNG - select S3C2410_DMA if ARCH_S3C24XX + select S3C24XX_DMAC if ARCH_S3C24XX select S3C64XX_PL080 if ARCH_S3C64XX - select SND_S3C_DMA if !ARCH_S3C24XX - select SND_S3C_DMA_LEGACY if ARCH_S3C24XX - select SND_SOC_GENERIC_DMAENGINE_PCM if !ARCH_S3C24XX + select SND_S3C_DMA + select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to the Samsung SoCs' Audio interfaces. You will also need to
@@ -19,7 +18,6 @@ config SND_S3C_DMA_LEGACY config SND_S3C24XX_I2S tristate - select S3C24XX_DMA config SND_S3C_I2SV2_SOC tristate
@@ -27,7 +25,6 @@ config SND_S3C_I2SV2_SOC config SND_S3C2412_SOC_I2S tristate select SND_S3C_I2SV2_SOC - select S3C2410_DMA config SND_SAMSUNG_PCM tristate
sound/soc/samsung/dmaengine.c +3 -0
@@ -17,6 +17,7 @@#include <linux/module.h> #include <linux/amba/pl08x.h> +#include <linux/platform_data/dma-s3c24xx.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -29,6 +30,8 @@#ifdef CONFIG_ARCH_S3C64XX #define filter_fn pl08x_filter_id +#elif defined(CONFIG_ARCH_S3C24XX ) +#define filter_fn s3c24xx_dma_filter#else #define filter_fn NULL#endif
sound/soc/samsung/s3c-i2s-v2.c +1 -16
@@ -392,8 +392,6 @@ static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd,int capture = (substream->stream ==SNDRV_PCM_STREAM_CAPTURE );unsigned long irqs;int ret =0 ; -struct s3c_dma_params *dma_data = -snd_soc_dai_get_dma_data (rtd->cpu_dai, substream);pr_debug ("Entered %s\n" , __func__);
@@ -424,13 +422,6 @@ static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd,local_irq_restore (irqs); -/* -* Load the next buffer to DMA to meet the reqirement -* of the auto reload mechanism of S3C24XX. -* This call won't bother S3C64XX. -*/ -s3c2410_dma_ctrl (dma_data->channel,S3C2410_DMAOP_STARTED ); -break ;case SNDRV_PCM_TRIGGER_STOP :
@@ -644,12 +635,6 @@ int s3c_i2sv2_probe(struct snd_soc_dai *dai,/* record our i2s structure for later use in the callbacks */ snd_soc_dai_set_drvdata (dai, i2s); - i2s->regs =ioremap (base,0x100 ); -if (i2s->regs ==NULL ) { -dev_err (dev,"cannot ioremap registers\n" ); -return -ENXIO ; - } - i2s->iis_pclk =clk_get (dev,"iis" );if (IS_ERR (i2s->iis_pclk)) {dev_err (dev,"failed to get iis_clock\n" );
@@ -729,7 +714,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id,struct snd_soc_component_driver *cmp_drv, struct snd_soc_dai_driver *dai_drv) { - struct snd_soc_dai_ops *ops = dai_drv->ops; + struct snd_soc_dai_ops *ops = (struct snd_soc_dai_ops *)dai_drv->ops; ops->trigger = s3c2412_i2s_trigger;if (!ops->hw_params)
sound/soc/samsung/s3c2412-i2s.c +23 -24
96 lines not on this page · raw message
sound/soc/samsung/s3c24xx-i2s.c +26 -30
115 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH RESEND v2 2/2 ASoC: samsung: drop support for legacy S3C24XX DMA API
---
v2: No changes
sound/soc/samsung/Kconfig | 3 - sound/soc/samsung/Makefile | 2 - sound/soc/samsung/dma.c | 460 --------------------------------------------- 3 files changed, 465 deletions(-) delete mode 100644 sound/soc/samsung/dma.c
sound/soc/samsung/Kconfig +0 -3
@@ -13,9 +13,6 @@ config SND_SOC_SAMSUNG config SND_S3C_DMA tristate -config SND_S3C_DMA_LEGACY - tristate - config SND_S3C24XX_I2S tristate
sound/soc/samsung/Makefile +0 -2
@@ -1,6 +1,5 @@ # S3c24XX Platform Support snd-soc-s3c-dma-objs := dmaengine.o -snd-soc-s3c-dma-legacy-objs := dma.o snd-soc-idma-objs := idma.o snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o
@@ -11,7 +10,6 @@ snd-soc-pcm-objs := pcm.o snd-soc-i2s-objs := i2s.o obj-$(CONFIG_SND_S3C_DMA) += snd-soc-s3c-dma.o -obj-$(CONFIG_SND_S3C_DMA_LEGACY) += snd-soc-s3c-dma-legacy.o obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o
sound/soc/samsung/dma.c deleted +0 -460
460 lines not on this page · raw message
Signature · 1 line
1.9.3
Re: [RESEND PATCH v2 2/2] ASoC: samsung: drop support for legacy S3C24XX DMA API
Hi,
Quoted 10 lines · Vasily Khoruzhick
Signed-off-by Vasily Khoruzhick <[email protected]>---
v2: No changessound/soc/samsung/Kconfig | 3 - sound/soc/samsung/Makefile | 2 - sound/soc/samsung/dma.c | 460 --------------------------------------------- 3 files changed, 465 deletions(-) delete mode 100644 sound/soc/samsung/dma.c
Best regards,
Tomasz
Hi,
Quoted 6 lines · Vasily Khoruzhick
Use dmaengine instead of legacy s3c24xx DMA API for s3c24xx and s3c2412
Signed-off-by Vasily Khoruzhick <[email protected]>---
v2: use hardcoded dma channel number
Quoted 7 lines
sound/soc/samsung/Kconfig | 9 +++---- sound/soc/samsung/dmaengine.c | 3 +++ sound/soc/samsung/s3c-i2s-v2.c | 17 +------------ sound/soc/samsung/s3c2412-i2s.c | 47 +++++++++++++++++----------------- sound/soc/samsung/s3c24xx-i2s.c | 56 +++++++++++++++++++---------------------- 5 files changed, 56 insertions(+), 76 deletions(-)
Best regards,
Tomasz
Mark Brown
maintainerQuoted 1 line · Vasily Khoruzhick
Use dmaengine instead of legacy s3c24xx DMA API for s3c24xx and s3c2412
These fail to apply against current code, can you please check and resend?
Re: [RESEND PATCH v2 1/2] ASoC: samsung: s3c24{xx, 12}-i2s: port to use generic dmaengine API
Quoted 4 lines · Mark Brown
Quoted 1 line · Vasily Khoruzhick
Use dmaengine instead of legacy s3c24xx DMA API for s3c24xx and s3c2412
Hi Mark,
Quoted 2 lines
These fail to apply against current code, can you please check and resend?
Sure, will resend tonight.
Regards
Vasily