diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-04-17 13:49:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-04-18 06:17:09 -0400 |
commit | 221dd96c30a7c65b24ead7fdd7645abb99506ce2 (patch) | |
tree | 07240bc608c36394383861cdbf441749b7e179ea /sound/soc | |
parent | 5db6aab6f36f7560dc95f7ca340d5632b7a3be6a (diff) |
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/bcm/Kconfig | 3 | ||||
-rw-r--r-- | sound/soc/kirkwood/Kconfig | 1 | ||||
-rw-r--r-- | sound/soc/pxa/Kconfig | 1 | ||||
-rw-r--r-- | sound/soc/qcom/Kconfig | 7 |
4 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig index edf367100ebd..02f50b7a966f 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig | |||
@@ -11,9 +11,8 @@ config SND_BCM2835_SOC_I2S | |||
11 | config SND_SOC_CYGNUS | 11 | config SND_SOC_CYGNUS |
12 | tristate "SoC platform audio for Broadcom Cygnus chips" | 12 | tristate "SoC platform audio for Broadcom Cygnus chips" |
13 | depends on ARCH_BCM_CYGNUS || COMPILE_TEST | 13 | depends on ARCH_BCM_CYGNUS || COMPILE_TEST |
14 | depends on HAS_DMA | ||
15 | help | 14 | help |
16 | Say Y if you want to add support for ASoC audio on Broadcom | 15 | Say Y if you want to add support for ASoC audio on Broadcom |
17 | Cygnus chips (bcm958300, bcm958305, bcm911360) | 16 | Cygnus chips (bcm958300, bcm958305, bcm911360) |
18 | 17 | ||
19 | If you don't know what to do here, say N. \ No newline at end of file | 18 | If you don't know what to do here, say N. |
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig index bc3c7b5ac752..132bb83f8e99 100644 --- a/sound/soc/kirkwood/Kconfig +++ b/sound/soc/kirkwood/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config SND_KIRKWOOD_SOC | 1 | config SND_KIRKWOOD_SOC |
2 | tristate "SoC Audio for the Marvell Kirkwood and Dove chips" | 2 | tristate "SoC Audio for the Marvell Kirkwood and Dove chips" |
3 | depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST | 3 | depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST |
4 | depends on HAS_DMA | ||
5 | help | 4 | help |
6 | Say Y or M if you want to add support for codecs attached to | 5 | Say Y or M if you want to add support for codecs attached to |
7 | the Kirkwood I2S interface. You will also need to select the | 6 | the Kirkwood I2S interface. You will also need to select the |
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 484ab3c2ad67..960744e46edc 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config SND_PXA2XX_SOC | 1 | config SND_PXA2XX_SOC |
2 | tristate "SoC Audio for the Intel PXA2xx chip" | 2 | tristate "SoC Audio for the Intel PXA2xx chip" |
3 | depends on ARCH_PXA || COMPILE_TEST | 3 | depends on ARCH_PXA || COMPILE_TEST |
4 | depends on HAS_DMA | ||
5 | select SND_PXA2XX_LIB | 4 | select SND_PXA2XX_LIB |
6 | help | 5 | help |
7 | Say Y or M if you want to add support for codecs attached to | 6 | Say Y or M if you want to add support for codecs attached to |
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 8ec9a074b38b..3cc252e55468 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig | |||
@@ -11,24 +11,21 @@ config SND_SOC_LPASS_CPU | |||
11 | 11 | ||
12 | config SND_SOC_LPASS_PLATFORM | 12 | config SND_SOC_LPASS_PLATFORM |
13 | tristate | 13 | tristate |
14 | depends on HAS_DMA | ||
15 | select REGMAP_MMIO | 14 | select REGMAP_MMIO |
16 | 15 | ||
17 | config SND_SOC_LPASS_IPQ806X | 16 | config SND_SOC_LPASS_IPQ806X |
18 | tristate | 17 | tristate |
19 | depends on HAS_DMA | ||
20 | select SND_SOC_LPASS_CPU | 18 | select SND_SOC_LPASS_CPU |
21 | select SND_SOC_LPASS_PLATFORM | 19 | select SND_SOC_LPASS_PLATFORM |
22 | 20 | ||
23 | config SND_SOC_LPASS_APQ8016 | 21 | config SND_SOC_LPASS_APQ8016 |
24 | tristate | 22 | tristate |
25 | depends on HAS_DMA | ||
26 | select SND_SOC_LPASS_CPU | 23 | select SND_SOC_LPASS_CPU |
27 | select SND_SOC_LPASS_PLATFORM | 24 | select SND_SOC_LPASS_PLATFORM |
28 | 25 | ||
29 | config SND_SOC_STORM | 26 | config SND_SOC_STORM |
30 | tristate "ASoC I2S support for Storm boards" | 27 | tristate "ASoC I2S support for Storm boards" |
31 | depends on SND_SOC_QCOM && HAS_DMA | 28 | depends on SND_SOC_QCOM |
32 | select SND_SOC_LPASS_IPQ806X | 29 | select SND_SOC_LPASS_IPQ806X |
33 | select SND_SOC_MAX98357A | 30 | select SND_SOC_MAX98357A |
34 | help | 31 | help |
@@ -37,7 +34,7 @@ config SND_SOC_STORM | |||
37 | 34 | ||
38 | config SND_SOC_APQ8016_SBC | 35 | config SND_SOC_APQ8016_SBC |
39 | tristate "SoC Audio support for APQ8016 SBC platforms" | 36 | tristate "SoC Audio support for APQ8016 SBC platforms" |
40 | depends on SND_SOC_QCOM && HAS_DMA | 37 | depends on SND_SOC_QCOM |
41 | select SND_SOC_LPASS_APQ8016 | 38 | select SND_SOC_LPASS_APQ8016 |
42 | help | 39 | help |
43 | Support for Qualcomm Technologies LPASS audio block in | 40 | Support for Qualcomm Technologies LPASS audio block in |