diff options
author | Hans de Goede <hdegoede@redhat.com> | 2018-04-13 14:45:37 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-04-19 14:12:36 +0200 |
commit | ed55fe24d7cb6fdc391ab808f22f163bd28928be (patch) | |
tree | d4c95b98ec98a9b0b0245eba7a1bea0bb322f33b /sound/soc/intel/Kconfig | |
parent | ASoC: topology: Revert recent changes while boot errors are investigated (diff) | |
download | linux-ed55fe24d7cb6fdc391ab808f22f163bd28928be.tar.xz linux-ed55fe24d7cb6fdc391ab808f22f163bd28928be.zip |
ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled
The sound/soc/intel/common/sst-acpi.c code only tries to load the
"baytrail-pcm-audio" driver (and supporting board drivers) when
SND_SST_ATOM_HIFI2_PLATFORM is not enabled, since otherwise these
are handled by snd-soc-sst-atom-hifi2-platform.ko.
Since these thus will never be used when SND_SST_ATOM_HIFI2_PLATFORM is
enabled, building these drivers when it is enabled is useless.
Add a Kconfig dependency to reflect this, so that SND_SOC_INTEL_BAYTRAIL
cannot be enabled when SND_SST_ATOM_HIFI2_PLATFORM is also enabled.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/Kconfig')
-rw-r--r-- | sound/soc/intel/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index addac2a8e52a..0caa1f4eb94d 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -61,7 +61,7 @@ config SND_SOC_INTEL_HASWELL config SND_SOC_INTEL_BAYTRAIL tristate "Baytrail (legacy) Platforms" - depends on DMADEVICES && ACPI + depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_ACPI select SND_SOC_INTEL_SST_FIRMWARE |