Merge commit 'v2.6.33-rc2' into for-2.6.33

[mv-sheeva.git] / sound / pci / ac97 / ac97_proc.c

diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c
index a3fdd7da911cd74887e80126029b0bac136a864c..73b17d526c8bb2cce8420d6f79f4ac88aae402b6 100644 (file)
--- a/sound/pci/ac97/ac97_proc.c
+++ b/sound/pci/ac97/ac97_proc.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
@@ -22,7 +22,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
 
@@ -126,6 +125,8 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe
         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) {
                val = snd_ac97_read(ac97, AC97_INT_PAGING);
                snd_ac97_update_bits(ac97, AC97_INT_PAGING,
@@ -236,10 +237,14 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe
                val = snd_ac97_read(ac97, AC97_PCM_MIC_ADC_RATE);
                snd_iprintf(buffer, "PCM MIC ADC      : %iHz\n", val);
        }
-       if ((ext & AC97_EI_SPDIF) || (ac97->flags & AC97_CS_SPDIF)) {
+       if ((ext & AC97_EI_SPDIF) || (ac97->flags & AC97_CS_SPDIF) ||
+           (ac97->id == AC97_ID_YMF743)) {
                if (ac97->flags & AC97_CS_SPDIF)
                        val = snd_ac97_read(ac97, AC97_CSR_SPDIF);
-               else
+               else if (ac97->id == AC97_ID_YMF743) {
+                       val = snd_ac97_read(ac97, AC97_YMF7X3_DIT_CTRL);
+                       val = 0x2000 | (val & 0xff00) >> 4 | (val & 0x38) >> 2;
+               } else
                        val = snd_ac97_read(ac97, AC97_SPDIF);
 
                snd_iprintf(buffer, "SPDIF Control    :%s%s%s%s Category=0x%x Generation=%i%s%s%s\n",