mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
8f501c7b44
Commit ae602456e8 ("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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
73 lines
3.5 KiB
Makefile
73 lines
3.5 KiB
Makefile
# S3c24XX Platform Support
|
|
snd-soc-s3c-dma-objs := dmaengine.o
|
|
snd-soc-idma-objs := idma.o
|
|
snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
|
|
snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o
|
|
snd-soc-ac97-objs := ac97.o
|
|
snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o
|
|
snd-soc-samsung-spdif-objs := spdif.o
|
|
snd-soc-pcm-objs := pcm.o
|
|
snd-soc-i2s-objs := i2s.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
|
|
obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o
|
|
obj-$(CONFIG_SND_SAMSUNG_SPDIF) += snd-soc-samsung-spdif.o
|
|
obj-$(CONFIG_SND_SAMSUNG_PCM) += snd-soc-pcm.o
|
|
obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o
|
|
obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-idma.o
|
|
|
|
# S3C24XX Machine Support
|
|
snd-soc-jive-wm8750-objs := jive_wm8750.o
|
|
snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o
|
|
snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o
|
|
snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o
|
|
snd-soc-s3c24xx-uda134x-objs := s3c24xx_uda134x.o
|
|
snd-soc-s3c24xx-simtec-objs := s3c24xx_simtec.o
|
|
snd-soc-s3c24xx-simtec-hermes-objs := s3c24xx_simtec_hermes.o
|
|
snd-soc-s3c24xx-simtec-tlv320aic23-objs := s3c24xx_simtec_tlv320aic23.o
|
|
snd-soc-h1940-uda1380-objs := h1940_uda1380.o
|
|
snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o
|
|
snd-soc-smdk-wm8580-objs := smdk_wm8580.o
|
|
snd-soc-smdk-wm8994-objs := smdk_wm8994.o
|
|
snd-soc-snow-objs := snow.o
|
|
snd-soc-smdk-wm9713-objs := smdk_wm9713.o
|
|
snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o
|
|
snd-soc-goni-wm8994-objs := goni_wm8994.o
|
|
snd-soc-smdk-spdif-objs := smdk_spdif.o
|
|
snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o
|
|
snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o
|
|
snd-soc-speyside-objs := speyside.o
|
|
snd-soc-tobermory-objs := tobermory.o
|
|
snd-soc-lowland-objs := lowland.o
|
|
snd-soc-littlemill-objs := littlemill.o
|
|
snd-soc-bells-objs := bells.o
|
|
snd-soc-odroidx2-max98090-objs := odroidx2_max98090.o
|
|
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_H1940_UDA1380) += snd-soc-h1940-uda1380.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o
|
|
obj-$(CONFIG_SND_SOC_SNOW) += snd-soc-snow.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o
|
|
obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o
|
|
obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o
|
|
obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
|
|
obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o
|
|
obj-$(CONFIG_SND_SOC_SMDK_WM8994_PCM) += snd-soc-smdk-wm8994pcm.o
|
|
obj-$(CONFIG_SND_SOC_SPEYSIDE) += snd-soc-speyside.o
|
|
obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o
|
|
obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
|
|
obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
|
|
obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o
|
|
obj-$(CONFIG_SND_SOC_ODROIDX2) += snd-soc-odroidx2-max98090.o
|