On 9/26/2020 10:59 AM, Cezary Rojewski wrote:
Prevent sound/soc/intel/haswell code compile and select catpt instead as
a recommended solution. Userspace-exposed members are compatible with
what is exposed by deprecated solution thus no harm is done. The only
visible difference is the newly added 'Loopback Mute' kcontrol.
Signed-off-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
---
Changes in v7:
- patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has
been moved to the back of the list: enable catpt after machine boards
have been prepared for it first
Changes in v5:
- remove DMADEVICES depends on: DW_DMAC_CORE already covers that
- add optional COMPILE_TEST depends on
sound/soc/intel/Kconfig | 24 ++++++++++++------------
sound/soc/intel/Makefile | 2 +-
sound/soc/intel/boards/Kconfig | 8 ++++----
sound/soc/intel/catpt/Makefile | 6 ++++++
4 files changed, 23 insertions(+), 17 deletions(-)
create mode 100644 sound/soc/intel/catpt/Makefile
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 0e48c4f532ce..dfc20f2bb859 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -47,21 +47,21 @@ config SND_SOC_INTEL_SST_FIRMWARE
# Haswell/Broadwell/Baytrail legacy and will be set
# when these platforms are enabled
-config SND_SOC_INTEL_HASWELL
- tristate "Haswell/Broadwell Platforms"
+config SND_SOC_INTEL_CATPT
+ tristate "Haswell and Broadwell"
+ depends on ACPI || COMPILE_TEST
We may want to limit building only to x86 platforms here.
depends on SND_DMA_SGBUF
- depends on DMADEVICES && ACPI
- select SND_SOC_INTEL_SST
- select SND_SOC_INTEL_SST_ACPI
- select SND_SOC_INTEL_SST_FIRMWARE
+ select DW_DMAC_CORE
select SND_SOC_ACPI_INTEL_MATCH
help
(...)
