Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6ca4946 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

ASoC: Intel: select DW_DMAC_CORE since it's mandatory 



commit ebf79091bf85d9b2270ab29191de9cd3aaf888c5 upstream.

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25640e79

sound/soc/intel/Kconfig

+13 −18
Original line number Diff line number Diff line
@@ -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