Browse Source

ASoC: Remove depends on HAS_DMA in case of platform dependency

Remove dependencies on HAS_DMA where a Kconfig symbol depends on another
symbol that implies HAS_DMA, and, optionally, on "|| COMPILE_TEST".
In most cases this other symbol is an architecture or platform specific
symbol, or PCI.

Generic symbols and drivers without platform dependencies keep their
dependencies on HAS_DMA, to prevent compiling subsystems or drivers that
cannot work anyway.

This simplifies the dependencies, and allows to improve compile-testing.

Note:
  - The various SND_SOC_LPASS_* symbols had to loose their dependencies
    on HAS_DMA, as they are selected by SND_SOC_STORM and/or
    SND_SOC_APQ8016_SBC.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Geert Uytterhoeven 7 years ago
parent
commit
221dd96c30
4 changed files with 3 additions and 9 deletions
  1. 1 2
      sound/soc/bcm/Kconfig
  2. 0 1
      sound/soc/kirkwood/Kconfig
  3. 0 1
      sound/soc/pxa/Kconfig
  4. 2 5
      sound/soc/qcom/Kconfig

+ 1 - 2
sound/soc/bcm/Kconfig

@@ -11,9 +11,8 @@ config SND_BCM2835_SOC_I2S
 config SND_SOC_CYGNUS
 config SND_SOC_CYGNUS
 	tristate "SoC platform audio for Broadcom Cygnus chips"
 	tristate "SoC platform audio for Broadcom Cygnus chips"
 	depends on ARCH_BCM_CYGNUS || COMPILE_TEST
 	depends on ARCH_BCM_CYGNUS || COMPILE_TEST
-	depends on HAS_DMA
 	help
 	help
 	  Say Y if you want to add support for ASoC audio on Broadcom
 	  Say Y if you want to add support for ASoC audio on Broadcom
 	  Cygnus chips (bcm958300, bcm958305, bcm911360)
 	  Cygnus chips (bcm958300, bcm958305, bcm911360)
 
 
-	  If you don't know what to do here, say N.
+	  If you don't know what to do here, say N.

+ 0 - 1
sound/soc/kirkwood/Kconfig

@@ -1,7 +1,6 @@
 config SND_KIRKWOOD_SOC
 config SND_KIRKWOOD_SOC
 	tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
 	tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
 	depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
 	depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
-	depends on HAS_DMA
 	help
 	help
 	  Say Y or M if you want to add support for codecs attached to
 	  Say Y or M if you want to add support for codecs attached to
 	  the Kirkwood I2S interface. You will also need to select the
 	  the Kirkwood I2S interface. You will also need to select the

+ 0 - 1
sound/soc/pxa/Kconfig

@@ -1,7 +1,6 @@
 config SND_PXA2XX_SOC
 config SND_PXA2XX_SOC
 	tristate "SoC Audio for the Intel PXA2xx chip"
 	tristate "SoC Audio for the Intel PXA2xx chip"
 	depends on ARCH_PXA || COMPILE_TEST
 	depends on ARCH_PXA || COMPILE_TEST
-	depends on HAS_DMA
 	select SND_PXA2XX_LIB
 	select SND_PXA2XX_LIB
 	help
 	help
 	  Say Y or M if you want to add support for codecs attached to
 	  Say Y or M if you want to add support for codecs attached to

+ 2 - 5
sound/soc/qcom/Kconfig

@@ -11,24 +11,21 @@ config SND_SOC_LPASS_CPU
 
 
 config SND_SOC_LPASS_PLATFORM
 config SND_SOC_LPASS_PLATFORM
 	tristate
 	tristate
-	depends on HAS_DMA
 	select REGMAP_MMIO
 	select REGMAP_MMIO
 
 
 config SND_SOC_LPASS_IPQ806X
 config SND_SOC_LPASS_IPQ806X
 	tristate
 	tristate
-	depends on HAS_DMA
 	select SND_SOC_LPASS_CPU
 	select SND_SOC_LPASS_CPU
 	select SND_SOC_LPASS_PLATFORM
 	select SND_SOC_LPASS_PLATFORM
 
 
 config SND_SOC_LPASS_APQ8016
 config SND_SOC_LPASS_APQ8016
 	tristate
 	tristate
-	depends on HAS_DMA
 	select SND_SOC_LPASS_CPU
 	select SND_SOC_LPASS_CPU
 	select SND_SOC_LPASS_PLATFORM
 	select SND_SOC_LPASS_PLATFORM
 
 
 config SND_SOC_STORM
 config SND_SOC_STORM
 	tristate "ASoC I2S support for Storm boards"
 	tristate "ASoC I2S support for Storm boards"
-	depends on SND_SOC_QCOM && HAS_DMA
+	depends on SND_SOC_QCOM
 	select SND_SOC_LPASS_IPQ806X
 	select SND_SOC_LPASS_IPQ806X
 	select SND_SOC_MAX98357A
 	select SND_SOC_MAX98357A
 	help
 	help
@@ -37,7 +34,7 @@ config SND_SOC_STORM
 
 
 config SND_SOC_APQ8016_SBC
 config SND_SOC_APQ8016_SBC
 	tristate "SoC Audio support for APQ8016 SBC platforms"
 	tristate "SoC Audio support for APQ8016 SBC platforms"
-	depends on SND_SOC_QCOM && HAS_DMA
+	depends on SND_SOC_QCOM
 	select SND_SOC_LPASS_APQ8016
 	select SND_SOC_LPASS_APQ8016
 	help
 	help
           Support for Qualcomm Technologies LPASS audio block in
           Support for Qualcomm Technologies LPASS audio block in