ALSA: cs553*: Fix dependencies
diff mbox

Message ID 20140310211226.17ad03c6@endymion.delvare
State Accepted
Headers show

Commit Message

Jean Delvare March 10, 2014, 8:12 p.m. UTC
The CS5530, CS5535 and CS5536 chipsets are companions of the Geode
series of processors, which are 32-bit x86 processors. So the
snd-cs5530 and snd-cs5535audio drivers are only needed on this
architecture, except for build testing purpose.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Jaya Kumar <jayakumar.alsa@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Takashi Iwai March 11, 2014, 6:54 a.m. UTC | #1
At Mon, 10 Mar 2014 21:12:26 +0100,
Jean Delvare wrote:
> 
> The CS5530, CS5535 and CS5536 chipsets are companions of the Geode
> series of processors, which are 32-bit x86 processors. So the
> snd-cs5530 and snd-cs5535audio drivers are only needed on this
> architecture, except for build testing purpose.
> 
> Signed-off-by: Jean Delvare <jdelvare@suse.de>
> Cc: Jaya Kumar <jayakumar.alsa@gmail.com>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.de>

Thanks, applied.


Takashi

> ---
>  sound/pci/Kconfig |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> --- linux-3.14-rc6.orig/sound/pci/Kconfig	2014-02-09 16:53:07.699734368 +0100
> +++ linux-3.14-rc6/sound/pci/Kconfig	2014-03-10 20:52:21.908690341 +0100
> @@ -276,7 +276,7 @@ config SND_CS46XX_NEW_DSP
>  
>  config SND_CS5530
>  	tristate "CS5530 Audio"
> -	depends on ISA_DMA_API
> +	depends on ISA_DMA_API && (X86_32 || COMPILE_TEST)
>  	select SND_SB16_DSP
>  	help
>  	  Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips.
> @@ -286,6 +286,7 @@ config SND_CS5530
>  
>  config SND_CS5535AUDIO
>  	tristate "CS5535/CS5536 Audio"
> +	depends on X86_32 || COMPILE_TEST
>  	select SND_PCM
>  	select SND_AC97_CODEC
>  	help
> 
> -- 
> Jean Delvare
> SUSE L3 Support
>
Jean Delvare March 11, 2014, 9:32 a.m. UTC | #2
Hi Takashi,

On Tue, 11 Mar 2014 07:54:25 +0100, Takashi Iwai wrote:
> At Mon, 10 Mar 2014 21:12:26 +0100,
> Jean Delvare wrote:
> > 
> > The CS5530, CS5535 and CS5536 chipsets are companions of the Geode
> > series of processors, which are 32-bit x86 processors. So the
> > snd-cs5530 and snd-cs5535audio drivers are only needed on this
> > architecture, except for build testing purpose.
> > 
> > Signed-off-by: Jean Delvare <jdelvare@suse.de>
> > Cc: Jaya Kumar <jayakumar.alsa@gmail.com>
> > Cc: Jaroslav Kysela <perex@perex.cz>
> > Cc: Takashi Iwai <tiwai@suse.de>
> 
> Thanks, applied.

Hmm, we might have been a bit too quick, sorry. Looking at the
defconfig files, it would seem that the CS5536 was also used on some
MIPS machines and the CS3350 was also used on some PowerPC machines:

arch/mips/configs/lemote2f_defconfig:CONFIG_SND_CS5535AUDIO=m
arch/powerpc/configs/ppc6xx_defconfig:CONFIG_SND_CS5530=m

So assuming these default configuration files are correct, the proper
dependencies would be somewhat different. I'll investigate and send an
updated or incremental patch, let me know what you prefer.
Takashi Iwai March 11, 2014, 9:38 a.m. UTC | #3
At Tue, 11 Mar 2014 10:32:01 +0100,
Jean Delvare wrote:
> 
> Hi Takashi,
> 
> On Tue, 11 Mar 2014 07:54:25 +0100, Takashi Iwai wrote:
> > At Mon, 10 Mar 2014 21:12:26 +0100,
> > Jean Delvare wrote:
> > > 
> > > The CS5530, CS5535 and CS5536 chipsets are companions of the Geode
> > > series of processors, which are 32-bit x86 processors. So the
> > > snd-cs5530 and snd-cs5535audio drivers are only needed on this
> > > architecture, except for build testing purpose.
> > > 
> > > Signed-off-by: Jean Delvare <jdelvare@suse.de>
> > > Cc: Jaya Kumar <jayakumar.alsa@gmail.com>
> > > Cc: Jaroslav Kysela <perex@perex.cz>
> > > Cc: Takashi Iwai <tiwai@suse.de>
> > 
> > Thanks, applied.
> 
> Hmm, we might have been a bit too quick, sorry. Looking at the
> defconfig files, it would seem that the CS5536 was also used on some
> MIPS machines and the CS3350 was also used on some PowerPC machines:
> 
> arch/mips/configs/lemote2f_defconfig:CONFIG_SND_CS5535AUDIO=m
> arch/powerpc/configs/ppc6xx_defconfig:CONFIG_SND_CS5530=m
> 
> So assuming these default configuration files are correct, the proper
> dependencies would be somewhat different. I'll investigate and send an
> updated or incremental patch, let me know what you prefer.

Ah, I vaguely remember of MIPS stuff, indeed.  I don't know of PPC,
but it's no surprise even if there are such.

So, yes, please send an incremental patch to cover these.


thanks,

Takashi

Patch
diff mbox

--- linux-3.14-rc6.orig/sound/pci/Kconfig	2014-02-09 16:53:07.699734368 +0100
+++ linux-3.14-rc6/sound/pci/Kconfig	2014-03-10 20:52:21.908690341 +0100
@@ -276,7 +276,7 @@  config SND_CS46XX_NEW_DSP
 
 config SND_CS5530
 	tristate "CS5530 Audio"
-	depends on ISA_DMA_API
+	depends on ISA_DMA_API && (X86_32 || COMPILE_TEST)
 	select SND_SB16_DSP
 	help
 	  Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips.
@@ -286,6 +286,7 @@  config SND_CS5530
 
 config SND_CS5535AUDIO
 	tristate "CS5535/CS5536 Audio"
+	depends on X86_32 || COMPILE_TEST
 	select SND_PCM
 	select SND_AC97_CODEC
 	help