V4L/DVB (9016): HVR3000/4000 Hauppauge related IR cleanups
[safe/jmp/linux-2.6] / sound / pci / emu10k1 / emu10k1_main.c
index cec7305..2f283ea 100644 (file)
@@ -1,10 +1,12 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips
  *
- *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
+ *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
  *      Added support for Audigy 2 Value.
+ *     Added EMU 1010 support.
+ *     General bug fixes and enhancements.
  *
  *
  *  BUGS:
  *
  */
 
-#include <sound/driver.h>
+#include <linux/sched.h>
+#include <linux/kthread.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/mutex.h>
+
 
 #include <sound/core.h>
 #include <sound/emu10k1.h>
+#include <linux/firmware.h>
 #include "p16v.h"
 #include "tina2.h"
+#include "p17v.h"
+
+
+#define HANA_FILENAME "emu/hana.fw"
+#define DOCK_FILENAME "emu/audio_dock.fw"
+#define EMU1010B_FILENAME "emu/emu1010b.fw"
+#define MICRO_DOCK_FILENAME "emu/micro_dock.fw"
+#define EMU0404_FILENAME "emu/emu0404.fw"
+#define EMU1010_NOTEBOOK_FILENAME "emu/emu1010_notebook.fw"
+
+MODULE_FIRMWARE(HANA_FILENAME);
+MODULE_FIRMWARE(DOCK_FILENAME);
+MODULE_FIRMWARE(EMU1010B_FILENAME);
+MODULE_FIRMWARE(MICRO_DOCK_FILENAME);
+MODULE_FIRMWARE(EMU0404_FILENAME);
+MODULE_FIRMWARE(EMU1010_NOTEBOOK_FILENAME);
 
 
 /*************************************************************************
@@ -115,11 +137,28 @@ static unsigned int spi_dac_init[] = {
                0x0622,
                0x1400,
 };
+
+static unsigned int i2c_adc_init[][2] = {
+       { 0x17, 0x00 }, /* Reset */
+       { 0x07, 0x00 }, /* Timeout */
+       { 0x0b, 0x22 },  /* Interface control */
+       { 0x0c, 0x22 },  /* Master mode control */
+       { 0x0d, 0x08 },  /* Powerdown control */
+       { 0x0e, 0xcf },  /* Attenuation Left  0x01 = -103dB, 0xff = 24dB */
+       { 0x0f, 0xcf },  /* Attenuation Right 0.5dB steps */
+       { 0x10, 0x7b },  /* ALC Control 1 */
+       { 0x11, 0x00 },  /* ALC Control 2 */
+       { 0x12, 0x32 },  /* ALC Control 3 */
+       { 0x13, 0x00 },  /* Noise gate control */
+       { 0x14, 0xa6 },  /* Limiter control */
+       { 0x15, ADC_MUX_2 },  /* ADC Mixer control. Mic for Audigy 2 ZS Notebook */
+};
        
 static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
 {
        unsigned int silent_page;
        int ch;
+       u32 tmp;
 
        /* disable audio and lock cache */
        outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK | HCFG_MUTEBUTTONENABLE,
@@ -158,8 +197,6 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
 
        if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
                /* Hacks for Alice3 to work independent of haP16V driver */
-               u32 tmp;
-
                //Setup SRCMulti_I2S SamplingRate
                tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
                tmp &= 0xfffff1ff;
@@ -179,8 +216,6 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
        }
        if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
                /* Hacks for Alice3 to work independent of haP16V driver */
-               u32 tmp;
-
                snd_printk(KERN_INFO "Audigy2 value: Special config.\n");
                //Setup SRCMulti_I2S SamplingRate
                tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
@@ -209,7 +244,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
                int size, n;
 
                size = ARRAY_SIZE(spi_dac_init);
-               for (n=0; n < size; n++)
+               for (n = 0; n < size; n++)
                        snd_emu10k1_spi_write(emu, spi_dac_init[n]);
 
                snd_emu10k1_ptr20_write(emu, 0x60, 0, 0x10);
@@ -224,8 +259,23 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
                 * GPIO7: Unknown
                 */
                outl(0x76, emu->port + A_IOCFG); /* Windows uses 0x3f76 */
+       }
+       if (emu->card_capabilities->i2c_adc) { /* Audigy 2 ZS Notebook with ADC Wolfson WM8775 */
+               int size, n;
 
+               snd_emu10k1_ptr20_write(emu, P17V_I2S_SRC_SEL, 0, 0x2020205f);
+               tmp = inl(emu->port + A_IOCFG);
+               outl(tmp | 0x4, emu->port + A_IOCFG);  /* Set bit 2 for mic input */
+               tmp = inl(emu->port + A_IOCFG);
+               size = ARRAY_SIZE(i2c_adc_init);
+               for (n = 0; n < size; n++)
+                       snd_emu10k1_i2c_write(emu, i2c_adc_init[n][0], i2c_adc_init[n][1]);
+               for (n=0; n < 4; n++) {
+                       emu->i2c_capture_volume[n][0]= 0xcf;
+                       emu->i2c_capture_volume[n][1]= 0xcf;
+               }
        }
+
        
        snd_emu10k1_ptr_write(emu, PTB, 0, emu->ptb_pages.addr);
        snd_emu10k1_ptr_write(emu, TCB, 0, 0);  /* taken from original driver */
@@ -237,6 +287,10 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
                snd_emu10k1_ptr_write(emu, MAPB, ch, silent_page);
        }
 
+       if (emu->card_capabilities->emu_model) {
+               outl(HCFG_AUTOMUTE_ASYNC |
+                       HCFG_EMU32_SLAVE |
+                       HCFG_AUDIOENABLE, emu->port + HCFG);
        /*
         *  Hokay, setup HCFG
         *   Mute Disable Audio = 0
@@ -244,7 +298,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
         *   Lock Sound Memory = 0
         *   Auto Mute = 1
         */
-       if (emu->audigy) {
+       } else if (emu->audigy) {
                if (emu->revision == 4) /* audigy2 */
                        outl(HCFG_AUDIOENABLE |
                             HCFG_AC3ENABLE_CDSPDIF |
@@ -263,8 +317,10 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
                outl(HCFG_LOCKTANKCACHE_MASK | HCFG_AUTOMUTE | HCFG_JOYENABLE, emu->port + HCFG);
 
        if (enable_ir) {        /* enable IR for SB Live */
-               if ( emu->card_capabilities->emu1212m) {
-                       ;  /* Disable all access to A_IOCFG for the emu1212m */
+               if (emu->card_capabilities->emu_model) {
+                       ;  /* Disable all access to A_IOCFG for the emu1010 */
+               } else if (emu->card_capabilities->i2c_adc) {
+                       ;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */
                } else if (emu->audigy) {
                        unsigned int reg = inl(emu->port + A_IOCFG);
                        outl(reg | A_IOCFG_GPOUT2, emu->port + A_IOCFG);
@@ -282,8 +338,10 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
                }
        }
        
-       if ( emu->card_capabilities->emu1212m) {
-               ;  /* Disable all access to A_IOCFG for the emu1212m */
+       if (emu->card_capabilities->emu_model) {
+               ;  /* Disable all access to A_IOCFG for the emu1010 */
+       } else if (emu->card_capabilities->i2c_adc) {
+               ;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */
        } else if (emu->audigy) {       /* enable analog output */
                unsigned int reg = inl(emu->port + A_IOCFG);
                outl(reg | A_IOCFG_GPOUT0, emu->port + A_IOCFG);
@@ -300,8 +358,10 @@ static void snd_emu10k1_audio_enable(struct snd_emu10k1 *emu)
        outl(inl(emu->port + HCFG) | HCFG_AUDIOENABLE, emu->port + HCFG);
 
        /* Enable analog/digital outs on audigy */
-       if ( emu->card_capabilities->emu1212m) {
-               ;  /* Disable all access to A_IOCFG for the emu1212m */
+       if (emu->card_capabilities->emu_model) {
+               ;  /* Disable all access to A_IOCFG for the emu1010 */
+       } else if (emu->card_capabilities->i2c_adc) {
+               ;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */
        } else if (emu->audigy) {
                outl(inl(emu->port + A_IOCFG) & ~0x44, emu->port + A_IOCFG);
  
@@ -529,7 +589,7 @@ static void snd_emu10k1_ecard_setadcgain(struct snd_emu10k1 * emu,
        snd_emu10k1_ecard_write(emu, emu->ecard_ctrl);
 }
 
-static int __devinit snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
+static int snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
 {
        unsigned int hc_value;
 
@@ -569,7 +629,7 @@ static int __devinit snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
        return 0;
 }
 
-static int __devinit snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
+static int snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
 {
        unsigned long special_port;
        unsigned int value;
@@ -591,136 +651,587 @@ static int __devinit snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
        value = inl(special_port);
 
        snd_emu10k1_ptr20_write(emu, TINA2_VOLUME, 0, 0xfefefefe); /* Defaults to 0x30303030 */
+       /* Delay to give time for ADC chip to switch on. It needs 113ms */
+       msleep(200);
        return 0;
 }
 
-static int snd_emu1212m_fpga_write(struct snd_emu10k1 * emu, int reg, int value)
+static int snd_emu1010_load_firmware(struct snd_emu10k1 * emu, const char * filename)
 {
-       if (reg<0 || reg>0x3f)
-               return 1;
-       reg+=0x40; /* 0x40 upwards are registers. */
-       if (value<0 || value>0x3f) /* 0 to 0x3f are values */
-               return 1;
-       outl(reg, emu->port + A_IOCFG);
-       outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
-       outl(value, emu->port + A_IOCFG);
-       outl(value | 0x80 , emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
-
-       return 0;
-}
+       int err;
+       int n, i;
+       int reg;
+       int value;
+       unsigned int write_post;
+       unsigned long flags;
+       const struct firmware *fw_entry;
+
+       if ((err = request_firmware(&fw_entry, filename, &emu->pci->dev)) != 0) {
+               snd_printk(KERN_ERR "firmware: %s not found. Err=%d\n",filename, err);
+               return err;
+       }
+       snd_printk(KERN_INFO "firmware size=0x%zx\n", fw_entry->size);
 
-static int snd_emu1212m_fpga_read(struct snd_emu10k1 * emu, int reg, int *value)
-{
-       if (reg<0 || reg>0x3f)
-               return 1;
-       reg+=0x40; /* 0x40 upwards are registers. */
-       outl(reg, emu->port + A_IOCFG);
-       outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
-       *value = inl(emu->port + A_IOCFG);
+       /* The FPGA is a Xilinx Spartan IIE XC2S50E */
+       /* GPIO7 -> FPGA PGMN
+        * GPIO6 -> FPGA CCLK
+        * GPIO5 -> FPGA DIN
+        * FPGA CONFIG OFF -> FPGA PGMN
+        */
+       spin_lock_irqsave(&emu->emu_lock, flags);
+       outl(0x00, emu->port + A_IOCFG); /* Set PGMN low for 1uS. */
+       write_post = inl(emu->port + A_IOCFG);
+       udelay(100);
+       outl(0x80, emu->port + A_IOCFG); /* Leave bit 7 set during netlist setup. */
+       write_post = inl(emu->port + A_IOCFG);
+       udelay(100); /* Allow FPGA memory to clean */
+       for(n = 0; n < fw_entry->size; n++) {
+               value=fw_entry->data[n];        
+               for(i = 0; i < 8; i++) {
+                       reg = 0x80;
+                       if (value & 0x1)
+                               reg = reg | 0x20;
+                       value = value >> 1;   
+                       outl(reg, emu->port + A_IOCFG);
+                       write_post = inl(emu->port + A_IOCFG);
+                       outl(reg | 0x40, emu->port + A_IOCFG);
+                       write_post = inl(emu->port + A_IOCFG);
+               }
+       }
+       /* After programming, set GPIO bit 4 high again. */
+       outl(0x10, emu->port + A_IOCFG);
+       write_post = inl(emu->port + A_IOCFG);
+       spin_unlock_irqrestore(&emu->emu_lock, flags);
 
+        release_firmware(fw_entry);
        return 0;
 }
 
-static int snd_emu1212m_fpga_netlist_write(struct snd_emu10k1 * emu, int reg, int value)
+static int emu1010_firmware_thread(void *data)
 {
-       snd_emu1212m_fpga_write(emu, 0x00, ((reg >> 8) & 0x3f) );
-       snd_emu1212m_fpga_write(emu, 0x01, (reg & 0x3f) );
-       snd_emu1212m_fpga_write(emu, 0x02, ((value >> 8) & 0x3f) );
-       snd_emu1212m_fpga_write(emu, 0x03, (value & 0x3f) );
+       struct snd_emu10k1 * emu = data;
+       int tmp,tmp2;
+       int reg;
+       int err;
+
+       for (;;) {
+               /* Delay to allow Audio Dock to settle */
+               msleep_interruptible(1000);
+               if (kthread_should_stop())
+                       break;
+               snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp ); /* IRQ Status */
+               snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg ); /* OPTIONS: Which cards are attached to the EMU */
+               if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {
+                       /* Audio Dock attached */
+                       /* Return to Audio Dock programming mode */
+                       snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");
+                       snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK );
+                       if (emu->card_capabilities->emu_model ==
+                           EMU_MODEL_EMU1010) {
+                               if ((err = snd_emu1010_load_firmware(emu, DOCK_FILENAME)) != 0) {
+                                       continue;
+                               }
+                       } else if (emu->card_capabilities->emu_model ==
+                                  EMU_MODEL_EMU1010B) {
+                               if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
+                                       continue;
+                               }
+                       } else if (emu->card_capabilities->emu_model ==
+                                  EMU_MODEL_EMU1616) {
+                               if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
+                                       continue;
+                               }
+                       }
 
+                       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);
+                       /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
+                       snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+                       snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID=0x%x\n",reg);
+                       if ((reg & 0x1f) != 0x15) {
+                               /* FPGA failed to be programmed */
+                               snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg=0x%x\n", reg);
+                               continue;
+                       }
+                       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);
+                       /* Sync clocking between 1010 and Dock */
+                       /* Allow DLL to settle */
+                       msleep(10);
+                       /* Unmute all. Default is muted after a firmware load */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+               }
+       }
+       snd_printk(KERN_INFO "emu1010: firmware thread stopping\n");
        return 0;
 }
 
-static int __devinit snd_emu10k1_emu1212m_init(struct snd_emu10k1 * emu)
+/*
+ * EMU-1010 - details found out from this driver, official MS Win drivers,
+ * testing the card:
+ *
+ * Audigy2 (aka Alice2):
+ * ---------------------
+ *     * communication over PCI
+ *     * conversion of 32-bit data coming over EMU32 links from HANA FPGA
+ *       to 2 x 16-bit, using internal DSP instructions
+ *     * slave mode, clock supplied by HANA
+ *     * linked to HANA using:
+ *             32 x 32-bit serial EMU32 output channels
+ *             16 x EMU32 input channels
+ *             (?) x I2S I/O channels (?)
+ *
+ * FPGA (aka HANA):
+ * ---------------
+ *     * provides all (?) physical inputs and outputs of the card
+ *             (ADC, DAC, SPDIF I/O, ADAT I/O, etc.)
+ *     * provides clock signal for the card and Alice2
+ *     * two crystals - for 44.1kHz and 48kHz multiples
+ *     * provides internal routing of signal sources to signal destinations
+ *     * inputs/outputs to Alice2 - see above
+ *
+ * Current status of the driver:
+ * ----------------------------
+ *     * only 44.1/48kHz supported (the MS Win driver supports up to 192 kHz)
+ *     * PCM device nb. 2:
+ *             16 x 16-bit playback - snd_emu10k1_fx8010_playback_ops
+ *             16 x 32-bit capture - snd_emu10k1_capture_efx_ops
+ */
+static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
 {
        unsigned int i;
-       int tmp;
-
-       snd_printk(KERN_ERR "emu1212m: Special config.\n");
+       int tmp,tmp2;
+       int reg;
+       int err;
+       const char *filename = NULL;
+
+       snd_printk(KERN_INFO "emu1010: Special config.\n");
+       /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
+        * Lock Sound Memory Cache, Lock Tank Memory Cache,
+        * Mute all codecs.
+        */
        outl(0x0005a00c, emu->port + HCFG);
-       outl(0x0005a004, emu->port + HCFG);
+       /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
+        * Lock Tank Memory Cache,
+        * Mute all codecs.
+        */
+       outl(0x0005a004, emu->port + HCFG); 
+       /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
+        * Mute all codecs.
+        */
        outl(0x0005a000, emu->port + HCFG);
+       /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
+        * Mute all codecs.
+        */
        outl(0x0005a000, emu->port + HCFG);
 
-       snd_emu1212m_fpga_read(emu, 0x22, &tmp );
-       snd_emu1212m_fpga_read(emu, 0x23, &tmp );
-       snd_emu1212m_fpga_read(emu, 0x24, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x04, 0x01 );
-       snd_emu1212m_fpga_read(emu, 0x0b, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x0b, 0x01 );
-       snd_emu1212m_fpga_read(emu, 0x10, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x10, 0x00 );
-       snd_emu1212m_fpga_read(emu, 0x11, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x11, 0x30 );
-       snd_emu1212m_fpga_read(emu, 0x13, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x13, 0x0f );
-       snd_emu1212m_fpga_read(emu, 0x11, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x11, 0x30 );
-       snd_emu1212m_fpga_read(emu, 0x0a, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x0a, 0x10 );
-       snd_emu1212m_fpga_write(emu, 0x0c, 0x19 );
-       snd_emu1212m_fpga_write(emu, 0x12, 0x0c );
-       snd_emu1212m_fpga_write(emu, 0x09, 0x0f );
-       snd_emu1212m_fpga_write(emu, 0x06, 0x00 );
-       snd_emu1212m_fpga_write(emu, 0x05, 0x00 );
-       snd_emu1212m_fpga_write(emu, 0x0e, 0x12 );
-       snd_emu1212m_fpga_netlist_write(emu, 0x0000, 0x0200);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0001, 0x0201);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0002, 0x0500);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0003, 0x0501);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0004, 0x0400);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0005, 0x0401);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0006, 0x0402);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0007, 0x0403);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0008, 0x0404);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0009, 0x0405);
-       snd_emu1212m_fpga_netlist_write(emu, 0x000a, 0x0406);
-       snd_emu1212m_fpga_netlist_write(emu, 0x000b, 0x0407);
-       snd_emu1212m_fpga_netlist_write(emu, 0x000c, 0x0100);
-       snd_emu1212m_fpga_netlist_write(emu, 0x000d, 0x0104);
-       snd_emu1212m_fpga_netlist_write(emu, 0x000e, 0x0200);
-       snd_emu1212m_fpga_netlist_write(emu, 0x000f, 0x0201);
-       for (i=0;i < 0x20;i++) {
-               snd_emu1212m_fpga_netlist_write(emu, 0x0100+i, 0x0000);
+       /* Disable 48Volt power to Audio Dock */
+       snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  0 );
+
+       /* ID, should read & 0x7f = 0x55. (Bit 7 is the IRQ bit) */
+       snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+       snd_printdd("reg1=0x%x\n",reg);
+       if ((reg & 0x3f) == 0x15) {
+               /* FPGA netlist already present so clear it */
+               /* Return to programming mode */
+
+               snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0x02 );
+       }
+       snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+       snd_printdd("reg2=0x%x\n",reg);
+       if ((reg & 0x3f) == 0x15) {
+               /* FPGA failed to return to programming mode */
+               snd_printk(KERN_INFO "emu1010: FPGA failed to return to programming mode\n");
+               return -ENODEV;
        }
-       for (i=0;i < 4;i++) {
-               snd_emu1212m_fpga_netlist_write(emu, 0x0200+i, 0x0000);
+       snd_printk(KERN_INFO "emu1010: EMU_HANA_ID=0x%x\n",reg);
+       switch (emu->card_capabilities->emu_model) {
+       case EMU_MODEL_EMU1010:
+               filename = HANA_FILENAME;
+               break;
+       case EMU_MODEL_EMU1010B:
+               filename = EMU1010B_FILENAME;
+               break;
+       case EMU_MODEL_EMU1616:
+               filename = EMU1010_NOTEBOOK_FILENAME;
+               break;
+       case EMU_MODEL_EMU0404:
+               filename = EMU0404_FILENAME;
+               break;
+       default:
+               filename = NULL;
+               return -ENODEV;
+               break;
        }
-       for (i=0;i < 7;i++) {
-               snd_emu1212m_fpga_netlist_write(emu, 0x0300+i, 0x0000);
+       snd_printk(KERN_INFO "emu1010: filename %s testing\n", filename);
+       err = snd_emu1010_load_firmware(emu, filename);
+       if (err != 0) {
+               snd_printk(
+                       KERN_INFO "emu1010: Loading Firmware file %s failed\n",
+                       filename);
+               return err;
        }
-       for (i=0;i < 7;i++) {
-               snd_emu1212m_fpga_netlist_write(emu, 0x0400+i, 0x0000);
+
+       /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
+       snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+       if ((reg & 0x3f) != 0x15) {
+               /* FPGA failed to be programmed */
+               snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file failed, reg=0x%x\n", reg);
+               return -ENODEV;
        }
-       snd_emu1212m_fpga_netlist_write(emu, 0x0500, 0x0108);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0501, 0x010c);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0600, 0x0110);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0601, 0x0114);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0700, 0x0118);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0701, 0x011c);
-       snd_emu1212m_fpga_write(emu, 0x07, 0x01 );
 
-       snd_emu1212m_fpga_read(emu, 0x21, &tmp );
+       snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
+       snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp );
+       snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2 );
+       snd_printk("Hana ver:%d.%d\n",tmp ,tmp2);
+       /* Enable 48Volt power to Audio Dock */
+       snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  EMU_HANA_DOCK_PWR_ON );
+
+       snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
+       snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg);
+       snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
+       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  */
+       /* 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 );
+       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_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_IN, 0x19 );
+       /* Unknown. */
+       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 );
+
+       snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
+       snd_printk(KERN_INFO "emu1010: Card options3=0x%x\n",reg);
+       /* Default WCLK set to 48kHz. */
+       snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00 );
+       /* Word Clock source, Internal 48kHz x1 */
+       snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K );
+       //snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X );
+       /* Audio Dock LEDs. */
+       snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12 );
 
-       outl(0x0000a000, emu->port + HCFG);
+#if 0
+       /* For 96kHz */
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_0, EMU_SRC_HAMOA_ADC_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_1, EMU_SRC_HAMOA_ADC_RIGHT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_4, EMU_SRC_HAMOA_ADC_LEFT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_5, EMU_SRC_HAMOA_ADC_RIGHT2);
+#endif
+#if 0
+       /* For 192kHz */
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_0, EMU_SRC_HAMOA_ADC_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_1, EMU_SRC_HAMOA_ADC_RIGHT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_2, EMU_SRC_HAMOA_ADC_LEFT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_3, EMU_SRC_HAMOA_ADC_RIGHT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_4, EMU_SRC_HAMOA_ADC_LEFT3);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_5, EMU_SRC_HAMOA_ADC_RIGHT3);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_6, EMU_SRC_HAMOA_ADC_LEFT4);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_7, EMU_SRC_HAMOA_ADC_RIGHT4);
+#endif
+#if 1
+       /* For 48kHz */
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_0, EMU_SRC_DOCK_MIC_A1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_1, EMU_SRC_DOCK_MIC_B1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_2, EMU_SRC_HAMOA_ADC_LEFT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_3, EMU_SRC_HAMOA_ADC_LEFT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_4, EMU_SRC_DOCK_ADC1_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_5, EMU_SRC_DOCK_ADC1_RIGHT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_6, EMU_SRC_DOCK_ADC2_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_7, EMU_SRC_DOCK_ADC2_RIGHT1);
+       /* Pavel Hofman - setting defaults for 8 more capture channels
+        * Defaults only, users will set their own values anyways, let's
+        * just copy/paste.
+        */
+       
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_8, EMU_SRC_DOCK_MIC_A1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_9, EMU_SRC_DOCK_MIC_B1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_A, EMU_SRC_HAMOA_ADC_LEFT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_B, EMU_SRC_HAMOA_ADC_LEFT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_C, EMU_SRC_DOCK_ADC1_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_D, EMU_SRC_DOCK_ADC1_RIGHT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_E, EMU_SRC_DOCK_ADC2_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_F, EMU_SRC_DOCK_ADC2_RIGHT1);
+#endif
+#if 0
+       /* Original */
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_4, EMU_SRC_HANA_ADAT);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_5, EMU_SRC_HANA_ADAT + 1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_6, EMU_SRC_HANA_ADAT + 2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_7, EMU_SRC_HANA_ADAT + 3);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_8, EMU_SRC_HANA_ADAT + 4);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_9, EMU_SRC_HANA_ADAT + 5);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_A, EMU_SRC_HANA_ADAT + 6);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_B, EMU_SRC_HANA_ADAT + 7);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_C, EMU_SRC_DOCK_MIC_A1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_D, EMU_SRC_DOCK_MIC_B1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_E, EMU_SRC_HAMOA_ADC_LEFT2);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE2_EMU32_F, EMU_SRC_HAMOA_ADC_LEFT2);
+#endif
+       for (i = 0;i < 0x20; i++ ) {
+               /* AudioDock Elink <-  Silence */
+               snd_emu1010_fpga_link_dst_src_write(emu, 0x0100+i, EMU_SRC_SILENCE);
+       }
+       for (i = 0;i < 4; i++) {
+               /* Hana SPDIF Out <- Silence */
+               snd_emu1010_fpga_link_dst_src_write(emu, 0x0200+i, EMU_SRC_SILENCE);
+       }
+       for (i = 0;i < 7; i++) {
+               /* Hamoa DAC <- Silence */
+               snd_emu1010_fpga_link_dst_src_write(emu, 0x0300+i, EMU_SRC_SILENCE);
+       }
+       for (i = 0;i < 7; i++) {
+               /* Hana ADAT Out <- Silence */
+               snd_emu1010_fpga_link_dst_src_write(emu, EMU_DST_HANA_ADAT + i, EMU_SRC_SILENCE);
+       }
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE_I2S0_LEFT, EMU_SRC_DOCK_ADC1_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE_I2S0_RIGHT, EMU_SRC_DOCK_ADC1_RIGHT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE_I2S1_LEFT, EMU_SRC_DOCK_ADC2_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE_I2S1_RIGHT, EMU_SRC_DOCK_ADC2_RIGHT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE_I2S2_LEFT, EMU_SRC_DOCK_ADC3_LEFT1);
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_ALICE_I2S2_RIGHT, EMU_SRC_DOCK_ADC3_RIGHT1);
+       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01 ); // Unmute all
+
+       snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp );
+       
+       /* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,
+        * Lock Sound Memory Cache, Lock Tank Memory Cache,
+        * Mute all codecs.
+        */
+       outl(0x0000a000, emu->port + HCFG); 
+       /* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,
+        * Lock Sound Memory Cache, Lock Tank Memory Cache,
+        * Un-Mute all codecs.
+        */
        outl(0x0000a001, emu->port + HCFG);
        /* Initial boot complete. Now patches */
 
-       snd_emu1212m_fpga_read(emu, 0x21, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x0c, 0x19 );
-       snd_emu1212m_fpga_write(emu, 0x12, 0x0c );
-       snd_emu1212m_fpga_write(emu, 0x0c, 0x19 );
-       snd_emu1212m_fpga_write(emu, 0x12, 0x0c );
-       snd_emu1212m_fpga_read(emu, 0x0a, &tmp );
-       snd_emu1212m_fpga_write(emu, 0x0a, 0x10 );
-
-       snd_emu1212m_fpga_read(emu, 0x20, &tmp );
-       snd_emu1212m_fpga_read(emu, 0x21, &tmp );
+       snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp );
+       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) */
+
+       /* Start Micro/Audio Dock firmware loader thread */
+       if (!emu->emu1010.firmware_thread) {
+               emu->emu1010.firmware_thread =
+                       kthread_create(emu1010_firmware_thread, emu,
+                                      "emu1010_firmware");
+               wake_up_process(emu->emu1010.firmware_thread);
+       }
 
-       snd_emu1212m_fpga_netlist_write(emu, 0x0300, 0x0312);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0301, 0x0313);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0200, 0x0302);
-       snd_emu1212m_fpga_netlist_write(emu, 0x0201, 0x0303);
+#if 0
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32B + 2); /* ALICE2 bus 0xa2 */
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_HAMOA_DAC_RIGHT1, EMU_SRC_ALICE_EMU32B + 3); /* ALICE2 bus 0xa3 */
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_HANA_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 2); /* ALICE2 bus 0xb2 */
+       snd_emu1010_fpga_link_dst_src_write(emu,
+               EMU_DST_HANA_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 3); /* ALICE2 bus 0xb3 */
+#endif
+       /* Default outputs */
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
+               /* 1616(M) cardbus default outputs */
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC1_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[0] = 17;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC1_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[1] = 18;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC2_LEFT1, EMU_SRC_ALICE_EMU32A + 2);
+               emu->emu1010.output_source[2] = 19;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC2_RIGHT1, EMU_SRC_ALICE_EMU32A + 3);
+               emu->emu1010.output_source[3] = 20;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC3_LEFT1, EMU_SRC_ALICE_EMU32A + 4);
+               emu->emu1010.output_source[4] = 21;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC3_RIGHT1, EMU_SRC_ALICE_EMU32A + 5);
+               emu->emu1010.output_source[5] = 22;
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_MANA_DAC_LEFT, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[16] = 17;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_MANA_DAC_RIGHT, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[17] = 18;
+       } else {
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC1_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[0] = 21;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC1_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[1] = 22;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC2_LEFT1, EMU_SRC_ALICE_EMU32A + 2);
+               emu->emu1010.output_source[2] = 23;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC2_RIGHT1, EMU_SRC_ALICE_EMU32A + 3);
+               emu->emu1010.output_source[3] = 24;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC3_LEFT1, EMU_SRC_ALICE_EMU32A + 4);
+               emu->emu1010.output_source[4] = 25;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC3_RIGHT1, EMU_SRC_ALICE_EMU32A + 5);
+               emu->emu1010.output_source[5] = 26;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC4_LEFT1, EMU_SRC_ALICE_EMU32A + 6);
+               emu->emu1010.output_source[6] = 27;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_DAC4_RIGHT1, EMU_SRC_ALICE_EMU32A + 7);
+               emu->emu1010.output_source[7] = 28;
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_PHONES_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[8] = 21;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_PHONES_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[9] = 22;
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[10] = 21;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_DOCK_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[11] = 22;
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[12] = 21;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[13] = 22;
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[14] = 21;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HAMOA_DAC_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[15] = 22;
+               /* ALICE2 bus 0xa0 */
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT, EMU_SRC_ALICE_EMU32A + 0);
+               emu->emu1010.output_source[16] = 21;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT + 1, EMU_SRC_ALICE_EMU32A + 1);
+               emu->emu1010.output_source[17] = 22;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT + 2, EMU_SRC_ALICE_EMU32A + 2);
+               emu->emu1010.output_source[18] = 23;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT + 3, EMU_SRC_ALICE_EMU32A + 3);
+               emu->emu1010.output_source[19] = 24;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT + 4, EMU_SRC_ALICE_EMU32A + 4);
+               emu->emu1010.output_source[20] = 25;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT + 5, EMU_SRC_ALICE_EMU32A + 5);
+               emu->emu1010.output_source[21] = 26;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT + 6, EMU_SRC_ALICE_EMU32A + 6);
+               emu->emu1010.output_source[22] = 27;
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       EMU_DST_HANA_ADAT + 7, EMU_SRC_ALICE_EMU32A + 7);
+               emu->emu1010.output_source[23] = 28;
+       }
+       /* TEMP: Select SPDIF in/out */
+       //snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); /* Output spdif */
+
+       /* TEMP: Select 48kHz SPDIF out */
+       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */
+       snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x0); /* Default fallback clock 48kHz */
+       /* Word Clock source, Internal 48kHz x1 */
+       snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K );
+       //snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X );
+       emu->emu1010.internal_clock = 1; /* 48000 */
+       snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);/* Set LEDs on Audio Dock */
+       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x1); /* Unmute all */
+       //snd_emu1010_fpga_write(emu, 0x7, 0x0); /* Mute all */
+       //snd_emu1010_fpga_write(emu, 0x7, 0x1); /* Unmute all */
+       //snd_emu1010_fpga_write(emu, 0xe, 0x12); /* Set LEDs on Audio Dock */
 
        return 0;
 }
@@ -738,13 +1249,22 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)
        if (emu->port) {        /* avoid access to already used hardware */
                snd_emu10k1_fx8010_tram_setup(emu, 0);
                snd_emu10k1_done(emu);
-               /* remove reserved page */
-               if (emu->reserved_page) {
-                       snd_emu10k1_synth_free(emu, (struct snd_util_memblk *)emu->reserved_page);
-                       emu->reserved_page = NULL;
-               }
                snd_emu10k1_free_efx(emu);
                }
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1010) {
+               /* Disable 48Volt power to Audio Dock */
+               snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  0 );
+       }
+       if (emu->emu1010.firmware_thread)
+               kthread_stop(emu->emu1010.firmware_thread);
+       if (emu->irq >= 0)
+               free_irq(emu->irq, emu);
+       /* remove reserved page */
+       if (emu->reserved_page) {
+               snd_emu10k1_synth_free(emu,
+                       (struct snd_util_memblk *)emu->reserved_page);
+               emu->reserved_page = NULL;
+       }
        if (emu->memhdr)
                snd_util_memhdr_free(emu->memhdr);
        if (emu->silent_page.area)
@@ -756,8 +1276,6 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)
 #ifdef CONFIG_PM
        free_pm_buffer(emu);
 #endif
-       if (emu->irq >= 0)
-               free_irq(emu->irq, (void *)emu);
        if (emu->port)
                pci_release_regions(emu->pci);
        if (emu->card_capabilities->ca0151_chip) /* P16V */     
@@ -789,18 +1307,84 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .ca0108_chip = 1,
         .spk71 = 1,
         .ac97_chip = 1} ,
+       /* Audigy4 (Not PRO) SB0610 */
+       /* Tested by James@superbug.co.uk 4th April 2006 */
+       /* A_IOCFG bits
+        * Output
+        * 0: ?
+        * 1: ?
+        * 2: ?
+        * 3: 0 - Digital Out, 1 - Line in
+        * 4: ?
+        * 5: ?
+        * 6: ?
+        * 7: ?
+        * Input
+        * 8: ?
+        * 9: ?
+        * A: Green jack sense (Front)
+        * B: ?
+        * C: Black jack sense (Rear/Side Right)
+        * D: Yellow jack sense (Center/LFE/Side Left)
+        * E: ?
+        * F: ?
+        *
+        * Digital Out/Line in switch using A_IOCFG bit 3 (0x08)
+        * 0 - Digital Out
+        * 1 - Line in
+        */
+       /* Mic input not tested.
+        * Analog CD input not tested
+        * Digital Out not tested.
+        * Line in working.
+        * Audio output 5.1 working. Side outputs not working.
+        */
+       /* DSP: CA10300-IAT LF
+        * DAC: Cirrus Logic CS4382-KQZ
+        * ADC: Philips 1361T
+        * AC97: Sigmatel STAC9750
+        * CA0151: None
+        */
+       {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10211102,
+        .driver = "Audigy2", .name = "Audigy 4 [SB0610]", 
+        .id = "Audigy2",
+        .emu10k2_chip = 1,
+        .ca0108_chip = 1,
+        .spk71 = 1,
+        .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
+        .ac97_chip = 1} ,
        /* Audigy 2 ZS Notebook Cardbus card.*/
-       /* Tested by James@superbug.co.uk 22th December 2005 */
+       /* Tested by James@superbug.co.uk 6th November 2006 */
        /* Audio output 7.1/Headphones working.
         * Digital output working. (AC3 not checked, only PCM)
-        * Audio inputs not tested.
+        * Audio Mic/Line inputs working.
+        * Digital input not tested.
         */ 
-       /* DSP: Tiny2
+       /* DSP: Tina2
         * DAC: Wolfson WM8768/WM8568
         * ADC: Wolfson WM8775
         * AC97: None
         * CA0151: None
         */
+       /* Tested by James@superbug.co.uk 4th April 2006 */
+       /* A_IOCFG bits
+        * Output
+        * 0: Not Used
+        * 1: 0 = Mute all the 7.1 channel out. 1 = unmute.
+        * 2: Analog input 0 = line in, 1 = mic in
+        * 3: Not Used
+        * 4: Digital output 0 = off, 1 = on.
+        * 5: Not Used
+        * 6: Not Used
+        * 7: Not Used
+        * Input
+        *      All bits 1 (0x3fxx) means nothing plugged in.
+        * 8-9: 0 = Line in/Mic, 2 = Optical in, 3 = Nothing.
+        * A-B: 0 = Headphones, 2 = Optical out, 3 = Nothing.
+        * C-D: 2 = Front/Rear/etc, 3 = nothing.
+        * E-F: Always 0
+        *
+        */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
         .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]", 
         .id = "Audigy2",
@@ -808,20 +1392,56 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .ca0108_chip = 1,
         .ca_cardbus_chip = 1,
         .spi_dac = 1,
+        .i2c_adc = 1,
         .spk71 = 1} ,
+       /* Tested by James@superbug.co.uk 4th Nov 2007. */
+       {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102,
+        .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]", 
+        .id = "EMU1010",
+        .emu10k2_chip = 1,
+        .ca0108_chip = 1,
+        .ca_cardbus_chip = 1,
+        .spk71 = 1 ,
+        .emu_model = EMU_MODEL_EMU1616},
+       /* Tested by James@superbug.co.uk 4th Nov 2007. */
+       {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102,
+        .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM????]", 
+        .id = "EMU1010",
+        .emu10k2_chip = 1,
+        .ca0108_chip = 1,
+        .spk71 = 1,
+        .emu_model = EMU_MODEL_EMU1010B},
+       /* Tested by James@superbug.co.uk 8th July 2005. */
+       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
+        .driver = "Audigy2", .name = "E-mu 1010 [4001]",
+        .id = "EMU1010",
+        .emu10k2_chip = 1,
+        .ca0102_chip = 1,
+        .spk71 = 1,
+        .emu_model = EMU_MODEL_EMU1010}, /* Emu 1010 */
+       /* EMU0404b */
+       {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102,
+        .driver = "Audigy2", .name = "E-mu 0404b [4002]",
+        .id = "EMU0404",
+        .emu10k2_chip = 1,
+        .ca0108_chip = 1,
+        .spk71 = 1,
+        .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+       /* Tested by James@superbug.co.uk 20-3-2007. */
+       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102,
+        .driver = "Audigy2", .name = "E-mu 0404 [4002]",
+        .id = "EMU0404",
+        .emu10k2_chip = 1,
+        .ca0102_chip = 1,
+        .spk71 = 1,
+        .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+       /* Audigy4 (Not PRO) SB0610 */
        {.vendor = 0x1102, .device = 0x0008, 
         .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]", 
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .ac97_chip = 1} ,
-       /* Tested by James@superbug.co.uk 8th July 2005. No sound available yet. */
-       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
-        .driver = "Audigy2", .name = "E-mu 1212m [4001]", 
-        .id = "EMU1212m",
-        .emu10k2_chip = 1,
-        .ca0102_chip = 1,
-        .emu1212m = 1} ,
        /* Tested by James@superbug.co.uk 3rd July 2005 */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
         .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]", 
@@ -833,8 +1453,11 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .spdif_bug = 1,
         .ac97_chip = 1} ,
        /* Tested by shane-alsa@cm.nu 5th Nov 2005 */
+       /* The 0x20061102 does have SB0350 written on it
+        * Just like 0x20021102
+        */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20061102,
-        .driver = "Audigy2", .name = "Audigy 2 [2006]", 
+        .driver = "Audigy2", .name = "Audigy 2 [SB0350b]", 
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
@@ -876,6 +1499,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1,
+        .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
         .driver = "Audigy2", .name = "Audigy 2 EX [1005]", 
@@ -885,6 +1509,17 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1} ,
+       /* Dell OEM/Creative Labs Audigy 2 ZS */
+       /* See ALSA bug#1365 */
+       {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10031102,
+        .driver = "Audigy2", .name = "Audigy 2 ZS [SB0353]",
+        .id = "Audigy2",
+        .emu10k2_chip = 1,
+        .ca0102_chip = 1,
+        .ca0151_chip = 1,
+        .spk71 = 1,
+        .spdif_bug = 1,
+        .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
         .driver = "Audigy2", .name = "Audigy 2 Platinum [SB0240P]", 
         .id = "Audigy2",
@@ -893,6 +1528,8 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1,
+        .invert_shared_spdif = 1,      /* digital/analog switch swapped */
+        .adc_1361t = 1,  /* 24 bit capture instead of 16bit. Fixes ALSA bug#324 */
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .revision = 0x04,
         .driver = "Audigy2", .name = "Audigy 2 [Unknown]",
@@ -945,6 +1582,14 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
+       /* Tested by ALSA bug#1680 26th December 2005 */
+       /* note: It really has SB0220 written on the card. */
+       {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80661102,
+        .driver = "EMU10K1", .name = "SB Live 5.1 Dell OEM [SB0220]", 
+        .id = "Live",
+        .emu10k1_chip = 1,
+        .ac97_chip = 1,
+        .sblive51 = 1} ,
        /* Tested by Thomas Zehetbauer 27th Aug 2005 */
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102,
         .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", 
@@ -1065,7 +1710,6 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
        struct snd_emu10k1 *emu;
        int idx, err;
        int is_audigy;
-       unsigned char revision;
        unsigned int silent_page;
        const struct snd_emu_chip_details *c;
        static struct snd_device_ops ops = {
@@ -1086,11 +1730,12 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
        emu->card = card;
        spin_lock_init(&emu->reg_lock);
        spin_lock_init(&emu->emu_lock);
+       spin_lock_init(&emu->spi_lock);
+       spin_lock_init(&emu->i2c_lock);
        spin_lock_init(&emu->voice_lock);
        spin_lock_init(&emu->synth_lock);
        spin_lock_init(&emu->memblk_lock);
-       init_MUTEX(&emu->ptb_lock);
-       init_MUTEX(&emu->fx8010.lock);
+       mutex_init(&emu->fx8010.lock);
        INIT_LIST_HEAD(&emu->mapped_link_head);
        INIT_LIST_HEAD(&emu->mapped_order_link_head);
        emu->pci = pci;
@@ -1098,8 +1743,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
        emu->synth = NULL;
        emu->get_synth_voice = NULL;
        /* read revision & serial */
-       pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
-       emu->revision = revision;
+       emu->revision = pci->revision;
        pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);
        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);
        snd_printdd("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model);
@@ -1175,12 +1819,6 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
        }
        emu->port = pci_resource_start(pci, 0);
 
-       if (request_irq(pci->irq, snd_emu10k1_interrupt, SA_INTERRUPT|SA_SHIRQ, "EMU10K1", (void *)emu)) {
-               err = -EBUSY;
-               goto error;
-       }
-       emu->irq = pci->irq;
-
        emu->max_cache_pages = max_cache_bytes >> PAGE_SHIFT;
        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                32 * 1024, &emu->ptb_pages) < 0) {
@@ -1188,8 +1826,9 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
                goto error;
        }
 
-       emu->page_ptr_table = (void **)vmalloc(emu->max_cache_pages * sizeof(void*));
-       emu->page_addr_table = (unsigned long*)vmalloc(emu->max_cache_pages * sizeof(unsigned long));
+       emu->page_ptr_table = vmalloc(emu->max_cache_pages * sizeof(void *));
+       emu->page_addr_table = vmalloc(emu->max_cache_pages *
+                                      sizeof(unsigned long));
        if (emu->page_ptr_table == NULL || emu->page_addr_table == NULL) {
                err = -ENOMEM;
                goto error;
@@ -1219,14 +1858,15 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
        emu->fx8010.extout_mask = extout_mask;
        emu->enable_ir = enable_ir;
 
+       if (emu->card_capabilities->ca_cardbus_chip) {
+               if ((err = snd_emu10k1_cardbus_init(emu)) < 0)
+                       goto error;
+       }
        if (emu->card_capabilities->ecard) {
                if ((err = snd_emu10k1_ecard_init(emu)) < 0)
                        goto error;
-       } else if (emu->card_capabilities->ca_cardbus_chip) {
-               if ((err = snd_emu10k1_cardbus_init(emu)) < 0)
-                       goto error;
-       } else if (emu->card_capabilities->emu1212m) {
-               if ((err = snd_emu10k1_emu1212m_init(emu)) < 0) {
+       } else if (emu->card_capabilities->emu_model) {
+               if ((err = snd_emu10k1_emu1010_init(emu)) < 0) {
                        snd_emu10k1_free(emu);
                        return err;
                }
@@ -1241,6 +1881,14 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
        emu->fx8010.etram_pages.area = NULL;
        emu->fx8010.etram_pages.bytes = 0;
 
+       /* irq handler must be registered after I/O ports are activated */
+       if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
+                       "EMU10K1", emu)) {
+               err = -EBUSY;
+               goto error;
+       }
+       emu->irq = pci->irq;
+
        /*
         *  Init to 0x02109204 :
         *  Clock accuracy    = 0     (1000ppm)
@@ -1370,8 +2018,12 @@ void snd_emu10k1_suspend_regs(struct snd_emu10k1 *emu)
 
 void snd_emu10k1_resume_init(struct snd_emu10k1 *emu)
 {
+       if (emu->card_capabilities->ca_cardbus_chip)
+               snd_emu10k1_cardbus_init(emu);
        if (emu->card_capabilities->ecard)
                snd_emu10k1_ecard_init(emu);
+       else if (emu->card_capabilities->emu_model)
+               snd_emu10k1_emu1010_init(emu);
        else
                snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);
        snd_emu10k1_init(emu, emu->enable_ir, 1);
@@ -1387,8 +2039,8 @@ void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu)
 
        /* resore for spdif */
        if (emu->audigy)
-               outl(emu->port + A_IOCFG, emu->saved_a_iocfg);
-       outl(emu->port + HCFG, emu->saved_hcfg);
+               outl(emu->saved_a_iocfg, emu->port + A_IOCFG);
+       outl(emu->saved_hcfg, emu->port + HCFG);
 
        val = emu->saved_ptr;
        for (reg = saved_regs; *reg != 0xff; reg++)
@@ -1401,16 +2053,3 @@ void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu)
        }
 }
 #endif
-
-/* memory.c */
-EXPORT_SYMBOL(snd_emu10k1_synth_alloc);
-EXPORT_SYMBOL(snd_emu10k1_synth_free);
-EXPORT_SYMBOL(snd_emu10k1_synth_bzero);
-EXPORT_SYMBOL(snd_emu10k1_synth_copy_from_user);
-EXPORT_SYMBOL(snd_emu10k1_memblk_map);
-/* voice.c */
-EXPORT_SYMBOL(snd_emu10k1_voice_alloc);
-EXPORT_SYMBOL(snd_emu10k1_voice_free);
-/* io.c */
-EXPORT_SYMBOL(snd_emu10k1_ptr_read);
-EXPORT_SYMBOL(snd_emu10k1_ptr_write);