| Message ID | 20180413124537.6765-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ed55fe24d7cb6fdc391ab808f22f163bd28928be |
| Headers | show |
On 4/13/18 7:45 AM, Hans de Goede wrote: > 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. We had this before and I dropped it when we cleaned the code, mainly since this dependency is one-sided and the selections in menuconfig are a bit odd. It's really a mutual exclusion we'd want. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > sound/soc/intel/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig > index ceb105cbd461..640f9bc9bd46 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 >
Hi, On 13-04-18 16:50, Pierre-Louis Bossart wrote: > On 4/13/18 7:45 AM, Hans de Goede wrote: >> 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. > > We had this before and I dropped it when we cleaned the code, mainly since this dependency is one-sided and the selections in menuconfig are a bit odd. It's really a mutual exclusion we'd want. I think we can get a mutual exclusion by also adding a depends on SND_SOC_INTEL_BAYTRAIL=n to the SND_SST_ATOM_HIFI2_PLATFORM Kconfig (this needs testing though), but do we really want mutual exclusion ? Distros tend to hit 'm' for all these options, so then we end up with which ever one comes first... Either way distros are currently building both and that is no good and since we advice the use of SND_SST_ATOM_HIFI2_PLATFORM making SND_SOC_INTEL_BAYTRAIL auto-disable seems like a good idea. Regards, Hans > >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> sound/soc/intel/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig >> index ceb105cbd461..640f9bc9bd46 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 >> >
On 04/13/2018 11:56 AM, Hans de Goede wrote: > Hi, > > On 13-04-18 16:50, Pierre-Louis Bossart wrote: >> On 4/13/18 7:45 AM, Hans de Goede wrote: >>> 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. >> >> We had this before and I dropped it when we cleaned the code, mainly >> since this dependency is one-sided and the selections in menuconfig >> are a bit odd. It's really a mutual exclusion we'd want. > > I think we can get a mutual exclusion by also adding a > depends on SND_SOC_INTEL_BAYTRAIL=n to the SND_SST_ATOM_HIFI2_PLATFORM > Kconfig (this needs testing though), but do we really want > mutual exclusion ? Distros tend to hit 'm' for all these options, > so then we end up with which ever one comes first... > > Either way distros are currently building both and that is no good > and since we advice the use of SND_SST_ATOM_HIFI2_PLATFORM making > SND_SOC_INTEL_BAYTRAIL auto-disable seems like a good idea. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > > Regards, > > Hans > > > >> >>> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>> --- >>> sound/soc/intel/Kconfig | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig >>> index ceb105cbd461..640f9bc9bd46 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 >>> >> > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index ceb105cbd461..640f9bc9bd46 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
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> --- sound/soc/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)