[ALSA] snd_emu10k1: Added support for 14dB Attenuation PADS on DACs and ADCs.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

1 files changed, 17 insertions, 12 deletions

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 09c4db8495b2..341a2775d286 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -725,25 +725,27 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp ); 
         /* ADAT input. */
         snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x01 );
-        snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_PADS, &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_DOCK_PADS, 0x00 );
+        snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00 );
+        emu->emu1010.adc_pads = 0x00;
         snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp );
         /* Unmute Audio dock DACs, Headphone source DAC-4. */
         snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30 );
         snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12 );
-        snd_emu1010_fpga_read(emu, EMU_HANA_UNKNOWN13, &tmp );
-        /* Unknown. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN13, 0x0f );
+        snd_emu1010_fpga_read(emu, EMU_HANA_DAC_PADS, &tmp );
+        /* DAC PADs. */
+        snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f );
+        emu->emu1010.dac_pads = 0x0f;
         snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp );
         snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30 );
         snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp );
         /* SPDIF Format. Set Consumer mode, 24bit, copy enable */
         snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 );
         /* MIDI routing */
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI, 0x19 );
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 );
         /* Unknown. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN12, 0x0c );
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c );
         /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); // IRQ Enable: All on */
         /* IRQ Enable: All off */
         snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00 );
@@ -880,10 +882,10 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
         /* Initial boot complete. Now patches */
 
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp );
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI, 0x19 ); /* MIDI Route */
-        snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN12, 0x0c ); /* Unknown */
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI, 0x19 ); /* MIDI Route */
-        snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN12, 0x0c ); /* Unknown */
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 ); /* MIDI Route */
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c ); /* Unknown */
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 ); /* MIDI Route */
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c ); /* Unknown */
         snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp ); 
         snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 ); /* SPDIF Format spdif  (or 0x11 for aes/ebu) */
 
@@ -902,7 +904,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
                 if ((err = snd_emu1010_load_firmware(emu, dock_filename)) != 0) {
                         return err;
                 }
-                snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
                 snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0 );
                 snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg );
                 snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS=0x%x\n",reg);
@@ -915,6 +916,10 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
                         return 0;
                         return -ENODEV;
                 }
+                snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
+                snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp );
+                snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2 );
+                snd_printk("Audio Dock ver:%d.%d\n",tmp ,tmp2);
         }
 #if 0
         snd_emu1010_fpga_link_dst_src_write(emu,