[PATCH] cs5536 ID for cs5535audio

[PATCH] cs5536 ID for cs5535audio

[René Rebe]

[-- Attachment #1: Type: text/plain, Size: 933 bytes --]

Hi all,

relative to 2.6.15-rc5-mm2 / alsa-cvs, works for me:

Added AMD CS5536 to the cs5535audio driver.

Signed-off-by: René Rebe <rene@exactcode.de>

--- sound/pci/cs5535audio/cs5535audio.c.orig	2005-12-14 14:39:11.000000000 +0100
+++ sound/pci/cs5535audio/cs5535audio.c	2005-12-14 14:29:23.000000000 +0100
@@ -46,8 +46,10 @@
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 static struct pci_device_id snd_cs5535audio_ids[] = {
-	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO, PCI_ANY_ID,
-		PCI_ANY_ID, 0, 0, 0, },
+	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
+	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
 	{}
 };
 


-- 
René Rebe - Rubensstr. 64 - 12157 Berlin (Europe / Germany)
            http://www.exactcode.de | http://www.t2-project.org
            +49 (0)30  255 897 45

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] cs5536 ID for cs5535audio

[Jiri Slaby]

René Rebe napsal(a):
> Hi all,
> 
> relative to 2.6.15-rc5-mm2 / alsa-cvs, works for me:
> 
> Added AMD CS5536 to the cs5535audio driver.
> 
> Signed-off-by: René Rebe <rene@exactcode.de>
> 
> --- sound/pci/cs5535audio/cs5535audio.c.orig	2005-12-14 14:39:11.000000000 +0100
> +++ sound/pci/cs5535audio/cs5535audio.c	2005-12-14 14:29:23.000000000 +0100
> @@ -46,8 +46,10 @@
>  static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
>  
>  static struct pci_device_id snd_cs5535audio_ids[] = {
> -	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO, PCI_ANY_ID,
> -		PCI_ANY_ID, 0, 0, 0, },
> +	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO,
> +	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> +	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO,
> +	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
Seems like a PCI_DEVICE() candidate

regards,
-- 
Jiri Slaby         www.fi.muni.cz/~xslaby
~\-/~      jirislaby@gmail.com      ~\-/~
B67499670407CE62ACC8 22A032CC55C339D47A7E

Re: cs5536 ID for cs5535audio

[jayakumar alsa]

On 12/14/05, René Rebe <rene@exactcode.de> wrote:
> Hi all,
>
> relative to 2.6.15-rc5-mm2 / alsa-cvs, works for me:
>
> Added AMD CS5536 to the cs5535audio driver.
>

René,

Your patch looks fine to me. If possible, could you add an update for
the Kconfig to list cs5536 within the cs5535audio entry. One thing
though, I'm concerned about master mixer control on certain GX3
boards. There was an issue raised by Stefan Schweizer where the
cs5535audio driver on GX3 boards (with at least one that used the
Realtek ALC203 rev 0 ac97 codec) fails to provide functional master
control. John Zulauf mentioned that certain GX3 reference board
designs wire headphone out to the connector rather than main. I still
haven't received the GX3 to test with so perhaps someone else would
like to test an AC97_TUNE_HP_ONLY ac97_quirk. Here's a rough start
that someone could use:

static char *ac97_quirk;
module_param(ac97_quirk, charp, 0444);
MODULE_PARM_DESC(ac97_quirk, "AC'97 board specific workarounds.");

static struct ac97_quirk ac97_quirks[] __devinitdata = {
	{
		.subvendor = use lspci to find out,
		.subdevice = something,
		.name = "boardname",     /* codecname */
		.type = AC97_TUNE_HP_ONLY
	},
	{}
};

then add:

snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);

after the snd_ac97_mixer call.

Thanks,
jk

> Signed-off-by: René Rebe <rene@exactcode.de>
>
> --- sound/pci/cs5535audio/cs5535audio.c.orig	2005-12-14 14:39:11.000000000
> +0100
> +++ sound/pci/cs5535audio/cs5535audio.c	2005-12-14 14:29:23.000000000 +0100
> @@ -46,8 +46,10 @@
>  static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
>
>  static struct pci_device_id snd_cs5535audio_ids[] = {
> -	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO, PCI_ANY_ID,
> -		PCI_ANY_ID, 0, 0, 0, },
> +	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO,
> +	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> +	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO,
> +	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
>  	{}
>  };
>
>
>
> --
> René Rebe - Rubensstr. 64 - 12157 Berlin (Europe / Germany)
>             http://www.exactcode.de | http://www.t2-project.org
>             +49 (0)30  255 897 45
>
>

Re: cs5536 ID for cs5535audio

[jayakumar alsa]

On 12/14/05, jayakumar alsa <jayakumar.alsa@gmail.com> wrote:
> On 12/14/05, René Rebe <rene@exactcode.de> wrote:
> >  static struct pci_device_id snd_cs5535audio_ids[] = {
> > -	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO, PCI_ANY_ID,
> > -		PCI_ANY_ID, 0, 0, 0, },
> > +	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO,
> > +	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> > +	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO,
> > +	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> >  	{}
> >  };

René,

Also, as Jiri suggested, could you change those to:

PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO)
PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO)

Thanks,
jk