diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-11 15:37:57 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:34 +0100 |
| commit | c96eff88147516a14543cca355112e16cedb2480 (patch) | |
| tree | 75c8918139ece2dd3c2cbdd495aeb25f22b54b01 | |
| parent | c6306e84601b15ee0152625757aab942fa2f2d28 (diff) | |
ASoC: fsl_esai, fsl_spdif: fix DMA workaround
This fixes commit 7511009a7642 ("MLK-15937-4: ASoC: fsl_spdif: Use DMA
workaround for SPDIF").
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | sound/soc/fsl/Kconfig | 5 | ||||
| -rw-r--r-- | sound/soc/fsl/Makefile | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 5eb4b1dae9bd..0ba0bf13c3a9 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -55,6 +55,7 @@ config SND_SOC_FSL_SSI config SND_SOC_FSL_SPDIF tristate "Sony/Philips Digital Interface (S/PDIF) module support" select REGMAP_MMIO + select SND_SOC_FSL_DMA_WORKAROUND select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC) help @@ -66,6 +67,7 @@ config SND_SOC_FSL_SPDIF config SND_SOC_FSL_ESAI tristate "Enhanced Serial Audio Interface (ESAI) module support" select REGMAP_MMIO + select SND_SOC_FSL_DMA_WORKAROUND select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n help Say Y if you want to add Enhanced Synchronous Audio Interface @@ -99,6 +101,9 @@ config SND_SOC_FSL_DSP This option is only useful for out-of-tree drivers since in-tree drivers select it automatically. +config SND_SOC_FSL_DMA_WORKAROUND + tristate + config SND_SOC_FSL_UTILS tristate diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 3e41fd9abfbd..ed0fe428464f 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -20,7 +20,7 @@ snd-soc-fsl-sai-objs := fsl_sai.o snd-soc-fsl-ssi-y := fsl_ssi.o snd-soc-fsl-ssi-$(CONFIG_DEBUG_FS) += fsl_ssi_dbg.o snd-soc-fsl-spdif-objs := fsl_spdif.o -snd-soc-fsl-esai-objs := fsl_esai.o fsl_dma_workaround.o +snd-soc-fsl-esai-objs := fsl_esai.o snd-soc-fsl-utils-objs := fsl_utils.o snd-soc-fsl-dma-objs := fsl_dma.o snd-soc-fsl-rpmsg-i2s-objs := fsl_rpmsg_i2s.o @@ -31,6 +31,7 @@ snd-soc-fsl-micfil-objs := fsl_micfil.o obj-$(CONFIG_SND_SOC_FSL_ACM) += snd-soc-fsl-acm.o obj-$(CONFIG_SND_SOC_FSL_AMIX) += snd-soc-fsl-amix.o obj-$(CONFIG_SND_SOC_FSL_ASRC) += snd-soc-fsl-asrc.o +obj-$(CONFIG_SND_SOC_FSL_DMA_WORKAROUND) += snd-soc-fsl-dma-workaround.o obj-$(CONFIG_SND_SOC_FSL_DSP) += snd-soc-fsl-dsp.o obj-$(CONFIG_SND_SOC_FSL_SAI) += snd-soc-fsl-sai.o obj-$(CONFIG_SND_SOC_FSL_SSI) += snd-soc-fsl-ssi.o |