Changeset 426 for GPL/trunk/alsa-kernel/pci/ac97

Timestamp:

May 9, 2009, 11:45:26 AM (17 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

Location:

GPL/trunk/alsa-kernel/pci/ac97

Files:

• ac97_codec.c (modified) (4 diffs)
• ac97_proc.c (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/ac97/ac97_codec.c

@@ -144 +144 @@
 { 0x43585421, 0xffffffff, "HSD11246",           NULL,           NULL }, // SmartMC II
 { 0x43585428, 0xfffffff8, "Cx20468",            patch_conexant, NULL }, // SmartAMC fixme: the mask might be different
+{ 0x43585430, 0xffffffff, "Cx20468-31",         patch_conexant, NULL },
 { 0x43585431, 0xffffffff, "Cx20551",           patch_cx20551,  NULL },
 { 0x44543031, 0xfffffff0, "DT0398",             NULL,           NULL },
@@ -384 +385 @@
 EXPORT_SYMBOL(snd_ac97_update_bits);
 
-/* no lock version - see snd_ac97_updat_bits() */
+/* no lock version - see snd_ac97_update_bits() */
 int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg,
                                 unsigned short mask, unsigned short value)
@@ -1682 +1683 @@
         int err, idx;
 
-        //printk("AC97_GPIO_CFG = %x\n",snd_ac97_read(ac97,AC97_GPIO_CFG));
+        /*
+        printk(KERN_DEBUG "AC97_GPIO_CFG = %x\n",
+               snd_ac97_read(ac97,AC97_GPIO_CFG));
+        */
         snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH));
         snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH));
@@ -2162 +2166 @@
                 /* nothing should be in powerdown mode */
                 snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0);
-                end_time = jiffies + msecs_to_jiffies(100);
+                end_time = jiffies + msecs_to_jiffies(120);
                 do {
                         if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f)

GPL/trunk/alsa-kernel/pci/ac97/ac97_proc.c

@@ -125 +125 @@
         snd_iprintf(buffer, "PCI Subsys Device: 0x%04x\n\n",
                     ac97->subsystem_device);
+
+        snd_iprintf(buffer, "Flags: %x\n", ac97->flags);
 
         if ((ac97->ext_id & AC97_EI_REV_MASK) >= AC97_EI_REV_23) {