Commit ff40260f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: fsl: refine DMA/FIQ dependencies

Commit 31ee2bfd ("ASoC: fsl: select SND_SOC_IMX_PCM_DMA
where needed") started selecting SND_SOC_IMX_PCM_DMA and
SND_SOC_IMX_PCM_FIQ for two drivers when building for i.MX.
This has turned out too aggressive, as FIQ is only available
for i.mx2 through i.mx5, but not i.mx6 or vybrid.

Further, two more drivers have become user-selectable in the
meantime, and they both depend on DMA for the imx platform
as well.

This changes the selection of FIQ to depend on the TZIC or
AVIC interrupt controllers that actually export the imx
specific FIQ interfaces, and adds the missing select statements
for SAI and ESAI.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 7171511e
...@@ -5,6 +5,7 @@ comment "Common SoC Audio options for Freescale CPUs:" ...@@ -5,6 +5,7 @@ comment "Common SoC Audio options for Freescale CPUs:"
config SND_SOC_FSL_SAI config SND_SOC_FSL_SAI
tristate "Synchronous Audio Interface (SAI) module support" tristate "Synchronous Audio Interface (SAI) module support"
select REGMAP_MMIO select REGMAP_MMIO
select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_GENERIC_DMAENGINE_PCM
help help
Say Y if you want to add Synchronous Audio Interface (SAI) Say Y if you want to add Synchronous Audio Interface (SAI)
...@@ -15,7 +16,7 @@ config SND_SOC_FSL_SAI ...@@ -15,7 +16,7 @@ config SND_SOC_FSL_SAI
config SND_SOC_FSL_SSI config SND_SOC_FSL_SSI
tristate "Synchronous Serial Interface module support" tristate "Synchronous Serial Interface module support"
select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)
select REGMAP_MMIO select REGMAP_MMIO
help help
Say Y if you want to add Synchronous Serial Interface (SSI) Say Y if you want to add Synchronous Serial Interface (SSI)
...@@ -27,7 +28,7 @@ config SND_SOC_FSL_SPDIF ...@@ -27,7 +28,7 @@ config SND_SOC_FSL_SPDIF
tristate "Sony/Philips Digital Interface module support" tristate "Sony/Philips Digital Interface module support"
select REGMAP_MMIO select REGMAP_MMIO
select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)
help help
Say Y if you want to add Sony/Philips Digital Interface (SPDIF) Say Y if you want to add Sony/Philips Digital Interface (SPDIF)
support for the Freescale CPUs. support for the Freescale CPUs.
...@@ -37,6 +38,7 @@ config SND_SOC_FSL_SPDIF ...@@ -37,6 +38,7 @@ config SND_SOC_FSL_SPDIF
config SND_SOC_FSL_ESAI config SND_SOC_FSL_ESAI
tristate "Enhanced Serial Audio Interface (ESAI) module support" tristate "Enhanced Serial Audio Interface (ESAI) module support"
select REGMAP_MMIO select REGMAP_MMIO
select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
select SND_SOC_FSL_UTILS select SND_SOC_FSL_UTILS
help help
Say Y if you want to add Enhanced Synchronous Audio Interface Say Y if you want to add Enhanced Synchronous Audio Interface
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment