108 lines
3.5 KiB
Diff
108 lines
3.5 KiB
Diff
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Date: Mon, 16 Jan 2017 15:12:26 +0200
|
|
Subject: ASoC: Intel: select DW_DMAC_CORE since it's mandatory
|
|
Origin: https://git.kernel.org/linus/ebf79091bf85d9b2270ab29191de9cd3aaf888c5
|
|
Bug-Debian: https://bugs.debian.org/851916
|
|
|
|
Select DW_DMAC_CORE like the rest of glue drivers do, e.g.
|
|
drivers/dma/dw/Kconfig.
|
|
|
|
While here group selectors under SND_SOC_INTEL_HASWELL and
|
|
SND_SOC_INTEL_BAYTRAIL.
|
|
|
|
Make platforms, which are using a common SST firmware driver, to be
|
|
dependent on DMADEVICES.
|
|
|
|
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/intel/Kconfig | 31 +++++++++++++------------------
|
|
1 file changed, 13 insertions(+), 18 deletions(-)
|
|
|
|
--- a/sound/soc/intel/Kconfig
|
|
+++ b/sound/soc/intel/Kconfig
|
|
@@ -33,11 +33,9 @@ config SND_SOC_INTEL_SST
|
|
select SND_SOC_INTEL_SST_MATCH if ACPI
|
|
depends on (X86 || COMPILE_TEST)
|
|
|
|
-# firmware stuff depends DW_DMAC_CORE; since there is no depends-on from
|
|
-# the reverse selection, each machine driver needs to select
|
|
-# SND_SOC_INTEL_SST_FIRMWARE carefully depending on DW_DMAC_CORE
|
|
config SND_SOC_INTEL_SST_FIRMWARE
|
|
tristate
|
|
+ select DW_DMAC_CORE
|
|
|
|
config SND_SOC_INTEL_SST_ACPI
|
|
tristate
|
|
@@ -47,16 +45,18 @@ config SND_SOC_INTEL_SST_MATCH
|
|
|
|
config SND_SOC_INTEL_HASWELL
|
|
tristate
|
|
+ select SND_SOC_INTEL_SST
|
|
select SND_SOC_INTEL_SST_FIRMWARE
|
|
|
|
config SND_SOC_INTEL_BAYTRAIL
|
|
tristate
|
|
+ select SND_SOC_INTEL_SST
|
|
+ select SND_SOC_INTEL_SST_FIRMWARE
|
|
|
|
config SND_SOC_INTEL_HASWELL_MACH
|
|
tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
|
|
depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
|
|
- depends on DW_DMAC_CORE
|
|
- select SND_SOC_INTEL_SST
|
|
+ depends on DMADEVICES
|
|
select SND_SOC_INTEL_HASWELL
|
|
select SND_SOC_RT5640
|
|
help
|
|
@@ -99,9 +99,8 @@ config SND_SOC_INTEL_BXT_RT298_MACH
|
|
config SND_SOC_INTEL_BYT_RT5640_MACH
|
|
tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
|
|
depends on X86_INTEL_LPSS && I2C
|
|
- depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n)
|
|
- select SND_SOC_INTEL_SST
|
|
- select SND_SOC_INTEL_SST_FIRMWARE
|
|
+ depends on DMADEVICES
|
|
+ depends on SND_SST_IPC_ACPI = n
|
|
select SND_SOC_INTEL_BAYTRAIL
|
|
select SND_SOC_RT5640
|
|
help
|
|
@@ -112,9 +111,8 @@ config SND_SOC_INTEL_BYT_RT5640_MACH
|
|
config SND_SOC_INTEL_BYT_MAX98090_MACH
|
|
tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
|
|
depends on X86_INTEL_LPSS && I2C
|
|
- depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n)
|
|
- select SND_SOC_INTEL_SST
|
|
- select SND_SOC_INTEL_SST_FIRMWARE
|
|
+ depends on DMADEVICES
|
|
+ depends on SND_SST_IPC_ACPI = n
|
|
select SND_SOC_INTEL_BAYTRAIL
|
|
select SND_SOC_MAX98090
|
|
help
|
|
@@ -123,9 +121,8 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
|
|
|
|
config SND_SOC_INTEL_BDW_RT5677_MACH
|
|
tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
|
|
- depends on X86_INTEL_LPSS && GPIOLIB && I2C && DW_DMAC
|
|
- depends on DW_DMAC_CORE=y
|
|
- select SND_SOC_INTEL_SST
|
|
+ depends on X86_INTEL_LPSS && GPIOLIB && I2C
|
|
+ depends on DMADEVICES
|
|
select SND_SOC_INTEL_HASWELL
|
|
select SND_SOC_RT5677
|
|
help
|
|
@@ -134,10 +131,8 @@ config SND_SOC_INTEL_BDW_RT5677_MACH
|
|
|
|
config SND_SOC_INTEL_BROADWELL_MACH
|
|
tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
|
|
- depends on X86_INTEL_LPSS && I2C && DW_DMAC && \
|
|
- I2C_DESIGNWARE_PLATFORM
|
|
- depends on DW_DMAC_CORE
|
|
- select SND_SOC_INTEL_SST
|
|
+ depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
|
|
+ depends on DMADEVICES
|
|
select SND_SOC_INTEL_HASWELL
|
|
select SND_SOC_RT286
|
|
help
|