| Message ID | 20201012095005.29859-1-cezary.rojewski@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1849a3872f035494639201fdefb394425233647b |
| Headers | show |
| Series | ASoC: Intel: atom: Remove duplicate kconfigs | expand |
Hi, On 10/12/20 11:50 AM, Cezary Rojewski wrote: > 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> Patch looks good to me: Acked-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > sound/soc/intel/Kconfig | 18 ------------------ > sound/soc/intel/atom/Makefile | 2 +- > sound/soc/intel/atom/sst/Makefile | 6 +++--- > 3 files changed, 4 insertions(+), 22 deletions(-) > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig > index d5bae5d1ab6f..a5b446d5af19 100644 > --- a/sound/soc/intel/Kconfig > +++ b/sound/soc/intel/Kconfig > @@ -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 > diff --git a/sound/soc/intel/atom/Makefile b/sound/soc/intel/atom/Makefile > index a9326d5ec44c..c66f03f5d8d6 100644 > --- a/sound/soc/intel/atom/Makefile > +++ b/sound/soc/intel/atom/Makefile > @@ -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/ > diff --git a/sound/soc/intel/atom/sst/Makefile b/sound/soc/intel/atom/sst/Makefile > index f17c905df3e2..5761d30a5f9d 100644 > --- a/sound/soc/intel/atom/sst/Makefile > +++ b/sound/soc/intel/atom/sst/Makefile > @@ -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 >
On Mon, 12 Oct 2020 11:50:05 +0200, Cezary Rojewski wrote: > 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 > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: atom: Remove duplicate kconfigs commit: 1849a3872f035494639201fdefb394425233647b All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index d5bae5d1ab6f..a5b446d5af19 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -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 diff --git a/sound/soc/intel/atom/Makefile b/sound/soc/intel/atom/Makefile index a9326d5ec44c..c66f03f5d8d6 100644 --- a/sound/soc/intel/atom/Makefile +++ b/sound/soc/intel/atom/Makefile @@ -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/ diff --git a/sound/soc/intel/atom/sst/Makefile b/sound/soc/intel/atom/sst/Makefile index f17c905df3e2..5761d30a5f9d 100644 --- a/sound/soc/intel/atom/sst/Makefile +++ b/sound/soc/intel/atom/sst/Makefile @@ -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
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> --- sound/soc/intel/Kconfig | 18 ------------------ sound/soc/intel/atom/Makefile | 2 +- sound/soc/intel/atom/sst/Makefile | 6 +++--- 3 files changed, 4 insertions(+), 22 deletions(-)