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

Unverified Commit 969eaef7 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs 



No reason why SND_SOC_INTEL_SST should be set here.
Also make sure same dependencies are used everywhere (only last one has SPI
in addition). Replace X86_INTEL_LPSS by MFD_INTEL_LPSS since the former
makes no sense for Skylake+ devices

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 99644597

sound/soc/intel/boards/Kconfig

+8 −9
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ if SND_SOC_INTEL_SKYLAKE 


config SND_SOC_INTEL_SKL_RT286_MACH

	tristate "ASoC Audio driver for SKL with RT286 I2S mode"

	depends on X86 && ACPI && I2C

	depends on MFD_INTEL_LPSS && I2C && ACPI

	select SND_SOC_RT286

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI
@@ -190,7 +190,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH 


config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH

	tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"

	depends on X86_INTEL_LPSS && I2C

	depends on MFD_INTEL_LPSS && I2C && ACPI

	select SND_SOC_NAU8825

	select SND_SOC_SSM4567

	select SND_SOC_DMIC
@@ -203,7 +203,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH 


config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH

	tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"

	depends on X86_INTEL_LPSS && I2C

	depends on MFD_INTEL_LPSS && I2C && ACPI

	select SND_SOC_NAU8825

	select SND_SOC_MAX98357A

	select SND_SOC_DMIC
@@ -216,7 +216,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH 


config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH

	tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"

	depends on X86 && ACPI && I2C

	depends on MFD_INTEL_LPSS && I2C && ACPI

	select SND_SOC_DA7219

	select SND_SOC_MAX98357A

	select SND_SOC_DMIC
@@ -230,7 +230,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_BXT_RT298_MACH

	tristate "ASoC Audio driver for Broxton with RT298 I2S mode"

	depends on X86 && ACPI && I2C

	depends on MFD_INTEL_LPSS && I2C && ACPI

	select SND_SOC_RT298

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI
@@ -243,8 +243,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH 


config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH

	tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"

	depends on X86_INTEL_LPSS && I2C

	select SND_SOC_INTEL_SST

	depends on MFD_INTEL_LPSS && I2C && ACPI

	select SND_SOC_RT5663

	select SND_SOC_MAX98927

	select SND_SOC_DMIC
@@ -257,8 +256,8 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH 


config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH

        tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"

        depends on X86_INTEL_LPSS && I2C && SPI

        select SND_SOC_INTEL_SST

        depends on MFD_INTEL_LPSS && I2C && ACPI

        depends on SPI

        select SND_SOC_RT5663

        select SND_SOC_RT5514

        select SND_SOC_RT5514_SPI