3 files changed, 53 insertions, 15 deletions

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index b985e660c60b..e22bb717e96a 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -873,7 +873,15 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
         snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg);
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp ); 
         /* Optical -> ADAT I/O  */
-        snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, EMU_HANA_OPTICAL_IN_ADAT | EMU_HANA_OPTICAL_OUT_ADAT );
+        /* 0 : SPDIF
+         * 1 : ADAT
+         */
+        emu->emu1010.optical_in = 1; /* IN_ADAT */
+        emu->emu1010.optical_out = 1; /* IN_ADAT */
+        tmp = 0;
+        tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |
+                (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);
+        snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp );
         snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp );
         /* Set no attenuation on Audio Dock pads. */
         snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00 );
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index a0dae0d916cb..3e2ed1d9d5fe 100644
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -240,8 +240,42 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry,
                                   struct snd_info_buffer *buffer)
 {
         struct snd_emu10k1 *emu = entry->private_data;
-        snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
-        snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
+        u32 value;
+        u32 value2;
+        unsigned long flags;
+        u32 rate;
+
+        if (emu->card_capabilities->emu1010) {
+                spin_lock_irqsave(&emu->emu_lock, flags);
+                snd_emu1010_fpga_read(emu, 0x38, &value);
+                spin_unlock_irqrestore(&emu->emu_lock, flags);
+                if ((value & 0x1) == 0) {
+                        spin_lock_irqsave(&emu->emu_lock, flags);
+                        snd_emu1010_fpga_read(emu, 0x2a, &value);
+                        snd_emu1010_fpga_read(emu, 0x2b, &value2);
+                        spin_unlock_irqrestore(&emu->emu_lock, flags);
+                        rate = 0x1770000 / (((value << 5) | value2)+1); 
+                        snd_iprintf(buffer, "ADAT Locked : %u\n", rate);
+                } else {
+                        snd_iprintf(buffer, "ADAT Unlocked\n");
+                }
+                spin_lock_irqsave(&emu->emu_lock, flags);
+                snd_emu1010_fpga_read(emu, 0x20, &value);
+                spin_unlock_irqrestore(&emu->emu_lock, flags);
+                if ((value & 0x4) == 0) {
+                        spin_lock_irqsave(&emu->emu_lock, flags);
+                        snd_emu1010_fpga_read(emu, 0x28, &value);
+                        snd_emu1010_fpga_read(emu, 0x29, &value2);
+                        spin_unlock_irqrestore(&emu->emu_lock, flags);
+                        rate = 0x1770000 / (((value << 5) | value2)+1); 
+                        snd_iprintf(buffer, "SPDIF Locked : %d\n", rate);
+                } else {
+                        snd_iprintf(buffer, "SPDIF Unlocked\n");
+                }
+        } else {
+                snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
+                snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
+        }
 #if 0
         val = snd_emu10k1_ptr_read(emu, ZVSRCS, 0);
         snd_iprintf(buffer, "\nZoomed Video\n");
@@ -379,20 +413,16 @@ static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry,
                                      struct snd_info_buffer *buffer)
 {
         struct snd_emu10k1 *emu = entry->private_data;
-        unsigned long value;
+        int value;
         unsigned long flags;
-        unsigned long regs;
         int i;
         snd_iprintf(buffer, "EMU1010 Registers:\n\n");
 
         for(i = 0; i < 0x40; i+=1) {
                 spin_lock_irqsave(&emu->emu_lock, flags);
-                regs=i+0x40; /* 0x40 upwards are registers. */
-                outl(regs, emu->port + A_IOCFG);
-                outl(regs | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
-                value = inl(emu->port + A_IOCFG);
+                snd_emu1010_fpga_read(emu, i, &value);
                 spin_unlock_irqrestore(&emu->emu_lock, flags);
-                snd_iprintf(buffer, "%02X: %08lX, %02lX\n", i, value, (value >> 8) & 0x7f);
+                snd_iprintf(buffer, "%02X: %08X, %02X\n", i, value, (value >> 8) & 0x7f);
         }
 }
 
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index 116e1c8d9361..971458b45944 100644
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -226,9 +226,9 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu,
         return 0;
 }
 
-int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value)
+int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value)
 {
-        if (reg < 0 || reg > 0x3f)
+        if (reg > 0x3f)
                 return 1;
         reg += 0x40; /* 0x40 upwards are registers. */
         if (value < 0 || value > 0x3f) /* 0 to 0x3f are values */
@@ -244,9 +244,9 @@ int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value)
         return 0;
 }
 
-int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value)
+int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, u32 reg, u32 *value)
 {
-        if (reg < 0 || reg > 0x3f)
+        if (reg > 0x3f)
                 return 1;
         reg += 0x40; /* 0x40 upwards are registers. */
         outl(reg, emu->port + A_IOCFG);
@@ -261,7 +261,7 @@ int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value)
 /* Each Destination has one and only one Source,
  * but one Source can feed any number of Destinations simultaneously.
  */
-int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int src)
+int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, u32 dst, u32 src)
 {
         snd_emu1010_fpga_write(emu, 0x00, ((dst >> 8) & 0x3f) );
         snd_emu1010_fpga_write(emu, 0x01, (dst & 0x3f) );