ASoC: fsl-ssi: fix build breakage introduced by commit 180ba0d3d731 ARM: i.MX: Compil...

The commit 180ba0d3d731 "ARM: i.MX: Compile FIQ code for AVIC & TZIC only"
disables the build of the file containing the mxc_set_irq_fiq()
function for configurations that do enable CONFIG_MXC_TZIC or
CONFIG_MXC_AVIC, leading to the following build error when compiling
sound/soc/fsl/ for e.g. i.MX6 (unless any machine that defines either
symbol is selected too):
    sound/built-in.o: In function `imx_pcm_fiq_free':
    last.c:(.text+0x2aca8): undefined reference to `mxc_set_irq_fiq'
    sound/built-in.o: In function `imx_pcm_fiq_init':
    last.c:(.text+0x2b1a4): undefined reference to `mxc_set_irq_fiq'
    last.c:(.text+0x2b200): undefined reference to `mxc_set_irq_fiq'
    make[1]: *** [vmlinux] Error 1
    make: *** [sub-make] Error 2

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index d262ec0653d3709c7e56e9ebce2c2a4bc3796f45..20d0a98dc27932c237a897abd2a3b58ef5af0688 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -15,7 +15,7 @@ config SND_SOC_FSL_SAI
 config SND_SOC_FSL_SSI
        tristate "Synchronous Serial Interface module support"
        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_AVIC || MXC_TZIC)
        help
          Say Y if you want to add Synchronous Serial Interface (SSI)
          support for the Freescale CPUs.
@@ -26,7 +26,7 @@ config SND_SOC_FSL_SPDIF
        tristate "Sony/Philips Digital Interface module support"
        select REGMAP_MMIO
        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_AVIC || MXC_TZIC)
        help
          Say Y if you want to add Sony/Philips Digital Interface (SPDIF)
          support for the Freescale CPUs.