Unverified Commit 1849a387 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

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: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20201012095005.29859-1-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9fe9efd6

sound/soc/intel/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -15,22 +15,6 @@ config SND_SOC_INTEL_SST_TOPLEVEL 


if SND_SOC_INTEL_SST_TOPLEVEL



config SND_SST_IPC

	tristate

	# This option controls the IPC core for HiFi2 platforms



config SND_SST_IPC_PCI

	tristate

	select SND_SST_IPC

	# This option controls the PCI-based IPC for HiFi2 platforms

	#  (Medfield, Merrifield).



config SND_SST_IPC_ACPI

	tristate

	select SND_SST_IPC

	# This option controls the ACPI-based IPC for HiFi2 platforms

	# (Baytrail, Cherrytrail)



config SND_SOC_INTEL_SST

	tristate
@@ -57,7 +41,6 @@ config SND_SST_ATOM_HIFI2_PLATFORM 
config SND_SST_ATOM_HIFI2_PLATFORM_PCI

	tristate "PCI HiFi2 (Merrifield) Platforms"

	depends on X86 && PCI

	select SND_SST_IPC_PCI

	select SND_SST_ATOM_HIFI2_PLATFORM

	help

	  If you have a Intel Merrifield/Edison platform, then
@@ -70,7 +53,6 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI 
	tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"

	default ACPI

	depends on X86 && ACPI && PCI

	select SND_SST_IPC_ACPI

	select SND_SST_ATOM_HIFI2_PLATFORM

	select SND_SOC_ACPI_INTEL_MATCH

	select IOSF_MBI

sound/soc/intel/atom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ snd-soc-sst-atom-hifi2-platform-objs := sst-mfld-platform-pcm.o \ 
obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += snd-soc-sst-atom-hifi2-platform.o



# DSP driver

obj-$(CONFIG_SND_SST_IPC) += sst/
 
obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += sst/

sound/soc/intel/atom/sst/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ snd-intel-sst-core-objs := sst.o sst_ipc.o sst_stream.o sst_drv_interface.o sst_ 
snd-intel-sst-pci-objs += sst_pci.o

snd-intel-sst-acpi-objs += sst_acpi.o



obj-$(CONFIG_SND_SST_IPC) += snd-intel-sst-core.o

obj-$(CONFIG_SND_SST_IPC_PCI) += snd-intel-sst-pci.o

obj-$(CONFIG_SND_SST_IPC_ACPI) += snd-intel-sst-acpi.o
 
obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += snd-intel-sst-core.o

obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI) += snd-intel-sst-pci.o

obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) += snd-intel-sst-acpi.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE