[PATCH] ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled

[PATCH] ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled

[Hans de Goede]

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(-)

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
-- 
2.17.0

Re: [PATCH] ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled

[Pierre-Louis Bossart]

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
> 

Re: [PATCH] ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled

[Hans de Goede]

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
>>
> 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled

[Pierre-Louis Bossart]

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

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Applied "ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled" to the asoc tree

[Mark Brown]

The patch

   ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

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

>From ed55fe24d7cb6fdc391ab808f22f163bd28928be Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 13 Apr 2018 14:45:37 +0200
Subject: [PATCH] ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when
 SND_SST_ATOM_HIFI2_PLATFORM is enabled

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>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 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 addac2a8e52a..0caa1f4eb94d 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
-- 
2.17.0