Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: Intel: atom: Remove duplicate kconfigs

SND_SST_IPC and its _PCI and _ACPI variants all target
sound/soc/intel/atom solution alone. SND_SST_IPC is the core component,
required for PCI and ACPI based atom platforms both. _PCI and _ACPI
target Merrifield/Edison and Baytrial/Cherrytrail platforms
respectively.

On top of that, there is an equivalent set of configs targeting the same
solution:
- SND_SST_ATOM_HIFI2_PLATFORM (core)
- SND_SST_ATOM_HIFI2_PLATFORM_PCI
- SND_SST_ATOM_HIFI2_PLATFORM_ACPI

As both sets do the same job - allow for granular platform selection -
remove the duplicate set and rely on SND_SST_ATOM_HIFI2_PLATOFRM_XXX
configs alone.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20201012095005.29859-1-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Cezary Rojewski and committed by
Mark Brown
1849a387 9fe9efd6

+4 -22
-18
sound/soc/intel/Kconfig
··· 15 15 16 16 if SND_SOC_INTEL_SST_TOPLEVEL 17 17 18 - config SND_SST_IPC 19 - tristate 20 - # This option controls the IPC core for HiFi2 platforms 21 - 22 - config SND_SST_IPC_PCI 23 - tristate 24 - select SND_SST_IPC 25 - # This option controls the PCI-based IPC for HiFi2 platforms 26 - # (Medfield, Merrifield). 27 - 28 - config SND_SST_IPC_ACPI 29 - tristate 30 - select SND_SST_IPC 31 - # This option controls the ACPI-based IPC for HiFi2 platforms 32 - # (Baytrail, Cherrytrail) 33 - 34 18 config SND_SOC_INTEL_SST 35 19 tristate 36 20 ··· 41 57 config SND_SST_ATOM_HIFI2_PLATFORM_PCI 42 58 tristate "PCI HiFi2 (Merrifield) Platforms" 43 59 depends on X86 && PCI 44 - select SND_SST_IPC_PCI 45 60 select SND_SST_ATOM_HIFI2_PLATFORM 46 61 help 47 62 If you have a Intel Merrifield/Edison platform, then ··· 53 70 tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms" 54 71 default ACPI 55 72 depends on X86 && ACPI && PCI 56 - select SND_SST_IPC_ACPI 57 73 select SND_SST_ATOM_HIFI2_PLATFORM 58 74 select SND_SOC_ACPI_INTEL_MATCH 59 75 select IOSF_MBI
+1 -1
sound/soc/intel/atom/Makefile
··· 6 6 obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += snd-soc-sst-atom-hifi2-platform.o 7 7 8 8 # DSP driver 9 - obj-$(CONFIG_SND_SST_IPC) += sst/ 9 + obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += sst/
+3 -3
sound/soc/intel/atom/sst/Makefile
··· 3 3 snd-intel-sst-pci-objs += sst_pci.o 4 4 snd-intel-sst-acpi-objs += sst_acpi.o 5 5 6 - obj-$(CONFIG_SND_SST_IPC) += snd-intel-sst-core.o 7 - obj-$(CONFIG_SND_SST_IPC_PCI) += snd-intel-sst-pci.o 8 - obj-$(CONFIG_SND_SST_IPC_ACPI) += snd-intel-sst-acpi.o 6 + obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += snd-intel-sst-core.o 7 + obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI) += snd-intel-sst-pci.o 8 + obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) += snd-intel-sst-acpi.o