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

Commit 8f501c7b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

ASoC: samsung: s3c24xx dmaengine follow-up 



Commit ae602456 ("ASoC: samsung: drop support for legacy
S3C24XX DMA API") removed the old code for the samsung specific
DMA interfaces, now that everybody can use dmaengine.

This picks up the few remaining pieces left over by that patch:

The most important one is the removal of the dma_data->ops->started()
calls in ac97. My understanding is that these are only required
for drivers that do not support cyclic transfers, which the new dma
engine driver now does, so we can simply remove them. This would also
fix at least one bug in the ac97 driver on newer machines, which
currently gives us a NULL pointer dereference from trying to call
dma_data->ops->started().

Further, we must no longer 'select' S3C2410_DMA, which conflicts
with the dmaengine driver. The SND_S3C_DMA symbol is now
useless, because it is always selected, so we can remove it
and build the dmaengine support unconditionally.

Finally, we should not 'select' S3C24XX_DMAC or S3C64XX_PL080,
which may have additional dependencies. This replaces it with
'depends on', to be more conservative.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d788cbd3

sound/soc/samsung/Kconfig

+2 −8
Original line number Diff line number Diff line 
config SND_SOC_SAMSUNG

	tristate "ASoC support for Samsung"

	depends on PLAT_SAMSUNG

	select S3C24XX_DMAC if ARCH_S3C24XX

	select S3C64XX_PL080 if ARCH_S3C64XX

	select SND_S3C_DMA

	depends on S3C64XX_PL080 || !ARCH_S3C64XX

	depends on S3C24XX_DMAC || !ARCH_S3C24XX

	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

	  select the audio interfaces to support below.



config SND_S3C_DMA

	tristate



config SND_S3C24XX_I2S

	tristate
@@ -77,7 +73,6 @@ config SND_SOC_SAMSUNG_SMDK_WM8994 
config SND_SOC_SAMSUNG_SMDK2443_WM9710

	tristate "SoC AC97 Audio support for SMDK2443 - WM9710"

	depends on SND_SOC_SAMSUNG && MACH_SMDK2443

	select S3C2410_DMA

	select AC97_BUS

	select SND_SOC_AC97_CODEC

	select SND_SAMSUNG_AC97
@@ -88,7 +83,6 @@ config SND_SOC_SAMSUNG_SMDK2443_WM9710 
config SND_SOC_SAMSUNG_LN2440SBC_ALC650

	tristate "SoC AC97 Audio support for LN2440SBC - ALC650"

	depends on SND_SOC_SAMSUNG && ARCH_S3C24XX

	select S3C2410_DMA

	select AC97_BUS

	select SND_SOC_AC97_CODEC

	select SND_SAMSUNG_AC97

sound/soc/samsung/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ snd-soc-samsung-spdif-objs := spdif.o 
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_SOC_SAMSUNG) += snd-soc-s3c-dma.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/ac97.c

+0 −17
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <sound/soc.h>



#include <mach/dma.h>

#include "regs-ac97.h"

#include <linux/platform_data/asoc-s3c.h>
@@ -225,9 +224,6 @@ static int s3c_ac97_trigger(struct snd_pcm_substream *substream, int cmd, 
				struct snd_soc_dai *dai)

{

	u32 ac_glbctrl;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct s3c_dma_params *dma_data =

		snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);



	ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);

	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
@@ -253,11 +249,6 @@ static int s3c_ac97_trigger(struct snd_pcm_substream *substream, int cmd, 


	writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);



	if (!dma_data->ops)

		dma_data->ops = samsung_dma_get_ops();



	dma_data->ops->started(dma_data->channel);



	return 0;

}
@@ -265,9 +256,6 @@ static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream, 
				    int cmd, struct snd_soc_dai *dai)

{

	u32 ac_glbctrl;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct s3c_dma_params *dma_data =

		snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);



	ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);

	ac_glbctrl &= ~S3C_AC97_GLBCTRL_MICINTM_MASK;
@@ -287,11 +275,6 @@ static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream, 


	writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);



	if (!dma_data->ops)

		dma_data->ops = samsung_dma_get_ops();



	dma_data->ops->started(dma_data->channel);



	return 0;

}