[ALSA] ice1712 - added support for M-Audio Delta 66E

See ALSA bug#3327 for more details. Experimental.
Also fix support for M-Audio Delta 1010E - subdevice check.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index c78894f110beff2c09902648d9f90827938cf707..0ed96c1780593f7d9e1f3efab180d4cbb2bcc022 100644 (file)
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -1,8 +1,8 @@
 /*
  *   ALSA driver for ICEnsemble ICE1712 (Envy24)
  *
- *   Lowlevel functions for M-Audio Delta 1010, 44, 66, Dio2496, Audiophile
- *                          Digigram VX442
+ *   Lowlevel functions for M-Audio Delta 1010, 1010E, 44, 66, 66E, Dio2496,
+ *                         Audiophile, Digigram VX442
  *
  *     Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
@@ -536,9 +536,14 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
        int err;
        struct snd_akm4xxx *ak;
 
-       if (ice->eeprom.subvendor && ice->eeprom.gpiodir == 0x7b)
+       if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DELTA1010 &&
+           ice->eeprom.gpiodir == 0x7b)
                ice->eeprom.subvendor = ICE1712_SUBDEVICE_DELTA1010E;
 
+       if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DELTA66 &&
+           ice->eeprom.gpiodir == 0xfb)
+               ice->eeprom.subvendor = ICE1712_SUBDEVICE_DELTA66E;
+
        /* determine I2C, DACs and ADCs */
        switch (ice->eeprom.subvendor) {
        case ICE1712_SUBDEVICE_AUDIOPHILE:
@@ -565,6 +570,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
                ice->num_total_dacs = 4;        /* two AK4324 codecs */
                break;
        case ICE1712_SUBDEVICE_VX442:
+       case ICE1712_SUBDEVICE_DELTA66E:        /* omni not suported yet */
                ice->num_total_dacs = 4;
                ice->num_total_adcs = 4;
                break;
@@ -577,6 +583,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
        case ICE1712_SUBDEVICE_DELTA1010E:
        case ICE1712_SUBDEVICE_DELTA1010LT:
        case ICE1712_SUBDEVICE_VX442:
+       case ICE1712_SUBDEVICE_DELTA66E:
                if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) {
                        snd_printk(KERN_ERR "unable to create I2C bus\n");
                        return err;
@@ -635,6 +642,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
                err = snd_ice1712_akm4xxx_init(ak, &akm_delta44, &akm_delta44_priv, ice);
                break;
        case ICE1712_SUBDEVICE_VX442:
+       case ICE1712_SUBDEVICE_DELTA66E:
                err = snd_ice1712_akm4xxx_init(ak, &akm_vx442, &akm_vx442_priv, ice);
                break;
        default:
@@ -725,6 +733,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)
        case ICE1712_SUBDEVICE_DELTA44:
        case ICE1712_SUBDEVICE_DELTA66:
        case ICE1712_SUBDEVICE_VX442:
+       case ICE1712_SUBDEVICE_DELTA66E:
                err = snd_ice1712_akm4xxx_build_controls(ice);
                if (err < 0)
                        return err;

diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h
index d07c49b4b66f5a87ff9092773a485cbec230b1ff..ea7116c304c04bce4635ce308b422cf33f6674c4 100644 (file)
--- a/sound/pci/ice1712/delta.h
+++ b/sound/pci/ice1712/delta.h
@@ -39,6 +39,7 @@
 #define ICE1712_SUBDEVICE_DELTA1010E   0xff1430d6
 #define ICE1712_SUBDEVICE_DELTADIO2496 0x121431d6
 #define ICE1712_SUBDEVICE_DELTA66      0x121432d6
+#define ICE1712_SUBDEVICE_DELTA66E     0xff1432d6
 #define ICE1712_SUBDEVICE_DELTA44      0x121433d6
 #define ICE1712_SUBDEVICE_AUDIOPHILE   0x121434d6
 #define ICE1712_SUBDEVICE_DELTA410     0x121438d6