Unverified Commit 221dd96c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5db6aab6

sound/soc/bcm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ config SND_BCM2835_SOC_I2S 
config SND_SOC_CYGNUS

	tristate "SoC platform audio for Broadcom Cygnus chips"

	depends on ARCH_BCM_CYGNUS || COMPILE_TEST

	depends on HAS_DMA

	help

	  Say Y if you want to add support for ASoC audio on Broadcom

	  Cygnus chips (bcm958300, bcm958305, bcm911360)

sound/soc/kirkwood/Kconfig

+0 −1
Original line number Diff line number Diff line 
config SND_KIRKWOOD_SOC

	tristate "SoC Audio for the Marvell Kirkwood and Dove chips"

	depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST

	depends on HAS_DMA

	help

	  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

sound/soc/pxa/Kconfig

+0 −1
Original line number Diff line number Diff line 
config SND_PXA2XX_SOC

	tristate "SoC Audio for the Intel PXA2xx chip"

	depends on ARCH_PXA || COMPILE_TEST

	depends on HAS_DMA

	select SND_PXA2XX_LIB

	help

	  Say Y or M if you want to add support for codecs attached to

sound/soc/qcom/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -11,24 +11,21 @@ config SND_SOC_LPASS_CPU 


config SND_SOC_LPASS_PLATFORM

	tristate

	depends on HAS_DMA

	select REGMAP_MMIO



config SND_SOC_LPASS_IPQ806X

	tristate

	depends on HAS_DMA

	select SND_SOC_LPASS_CPU

	select SND_SOC_LPASS_PLATFORM



config SND_SOC_LPASS_APQ8016

	tristate

	depends on HAS_DMA

	select SND_SOC_LPASS_CPU

	select SND_SOC_LPASS_PLATFORM



config SND_SOC_STORM

	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_MAX98357A

	help
@@ -37,7 +34,7 @@ config SND_SOC_STORM 


config SND_SOC_APQ8016_SBC

	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

	help

          Support for Qualcomm Technologies LPASS audio block in

CRA Git | Maintained and supported by SUSTech CRA and CCSE