[ALSA] #4/4 for Zoom Video - add Zoom Video support
[linux-2.6.git] / sound / isa / es18xx.c
index 06c0e77..7978580 100644 (file)
  * - contrarily to some pages in DS_1869.PDF the rates can be set
  *   independently.
  *
+ * - Zoom Video is implemented by sharing the FM DAC, thus the user can
+ *   have either FM playback or Video playback but not both simultaneously.
+ *   The Video Playback Switch mixer control toggles this choice.
+ *
  * BUGS:
  *
  * - There is a major trouble I noted:
  *
  */
 
-
+/*
+ * ES1879 NOTES:
+ * - When Zoom Video is enabled (reg 0x71 bit 6 toggled on) the PCM playback
+ *   seems to be effected (speaker_test plays a lower frequency). Can't find
+ *   anything in the datasheet to account for this, so a Video Playback Switch
+ *   control has been included to allow ZV to be enabled only when necessary.
+ *   Then again on at least one test system the 0x71 bit 6 enable bit is not 
+ *   needed for ZV, so maybe the datasheet is entirely wrong here.
+ */
 #include <sound/driver.h>
-#include <asm/io.h>
-#include <asm/dma.h>
 #include <linux/init.h>
-#include <linux/pm.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include <linux/isapnp.h>
 #include <linux/moduleparam.h>
+#include <asm/io.h>
+#include <asm/dma.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/mpu401.h>
 #include <sound/opl3.h>
-#define SNDRV_LEGACY_AUTO_PROBE
 #define SNDRV_LEGACY_FIND_FREE_IRQ
 #define SNDRV_LEGACY_FIND_FREE_DMA
 #include <sound/initval.h>
@@ -128,6 +141,14 @@ struct snd_es18xx {
 #endif
 };
 
+struct snd_audiodrive {
+       struct snd_es18xx *chip;
+#ifdef CONFIG_PNP
+       struct pnp_dev *dev;
+       struct pnp_dev *devc;
+#endif
+};
+
 #define AUDIO1_IRQ     0x01
 #define AUDIO2_IRQ     0x02
 #define HWV_IRQ                0x04
@@ -140,7 +161,7 @@ struct snd_es18xx {
 #define ES18XX_DUPLEX_SAME 0x0010      /* Playback and record must share the same rate */
 #define ES18XX_NEW_RATE        0x0020  /* More precise rate setting */
 #define ES18XX_AUXB    0x0040  /* AuxB mixer control */
-#define ES18XX_HWV     0x0080  /* Has hardware volume */
+#define ES18XX_HWV     0x0080  /* Has seperate hardware volume mixer controls*/
 #define ES18XX_MONO    0x0100  /* Mono_in mixer control */
 #define ES18XX_I2S     0x0200  /* I2S mixer control */
 #define ES18XX_MUTEREC 0x0400  /* Record source can be muted */
@@ -780,9 +801,12 @@ static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *r
 
        /* Hardware volume */
        if (status & HWV_IRQ) {
-               int split = snd_es18xx_mixer_read(chip, 0x64) & 0x80;
-               snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_switch->id);
-               snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_volume->id);
+               int split = 0;
+               if (chip->caps & ES18XX_HWV) {
+                       split = snd_es18xx_mixer_read(chip, 0x64) & 0x80;
+                       snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_switch->id);
+                       snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_volume->id);
+               }
                if (!split) {
                        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_switch->id);
                        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_volume->id);
@@ -931,37 +955,118 @@ static int snd_es18xx_capture_close(struct snd_pcm_substream *substream)
  *  MIXER part
  */
 
+/* Record source mux routines:
+ * Depending on the chipset this mux switches between 4, 5, or 8 possible inputs.
+ * bit table for the 4/5 source mux:
+ * reg 1C:
+ *  b2 b1 b0   muxSource
+ *   x  0  x   microphone
+ *   0  1  x   CD
+ *   1  1  0   line
+ *   1  1  1   mixer
+ * if it's "mixer" and it's a 5 source mux chipset then reg 7A bit 3 determines
+ * either the play mixer or the capture mixer.
+ *
+ * "map4Source" translates from source number to reg bit pattern
+ * "invMap4Source" translates from reg bit pattern to source number
+ */
+
 static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-       static char *texts[8] = {
+       static char *texts4Source[4] = {
+               "Mic", "CD", "Line", "Master"
+       };
+       static char *texts5Source[5] = {
+               "Mic", "CD", "Line", "Master", "Mix"
+       };
+       static char *texts8Source[8] = {
                "Mic", "Mic Master", "CD", "AOUT",
                "Mic1", "Mix", "Line", "Master"
        };
+       struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
 
        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
        uinfo->count = 1;
-       uinfo->value.enumerated.items = 8;
-       if (uinfo->value.enumerated.item > 7)
-               uinfo->value.enumerated.item = 7;
-       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       switch (chip->version) {
+       case 0x1868:
+       case 0x1878:
+               uinfo->value.enumerated.items = 4;
+               if (uinfo->value.enumerated.item > 3)
+                       uinfo->value.enumerated.item = 3;
+               strcpy(uinfo->value.enumerated.name, texts4Source[uinfo->value.enumerated.item]);
+               break;
+       case 0x1887:
+       case 0x1888:
+               uinfo->value.enumerated.items = 5;
+               if (uinfo->value.enumerated.item > 4)
+                       uinfo->value.enumerated.item = 4;
+               strcpy(uinfo->value.enumerated.name, texts5Source[uinfo->value.enumerated.item]);
+               break;
+       case 0x1869: /* DS somewhat contradictory for 1869: could be be 5 or 8 */
+       case 0x1879:
+               uinfo->value.enumerated.items = 8;
+               if (uinfo->value.enumerated.item > 7)
+                       uinfo->value.enumerated.item = 7;
+               strcpy(uinfo->value.enumerated.name, texts8Source[uinfo->value.enumerated.item]);
+               break;
+       default:
+               return -EINVAL;
+       }
        return 0;
 }
 
 static int snd_es18xx_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
+       static unsigned char invMap4Source[8] = {0, 0, 1, 1, 0, 0, 2, 3};
        struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
-       ucontrol->value.enumerated.item[0] = snd_es18xx_mixer_read(chip, 0x1c) & 0x07;
+       int muxSource = snd_es18xx_mixer_read(chip, 0x1c) & 0x07;
+       if (!(chip->version == 0x1869 || chip->version == 0x1879)) {
+               muxSource = invMap4Source[muxSource];
+               if (muxSource==3 && 
+                   (chip->version == 0x1887 || chip->version == 0x1888) &&
+                   (snd_es18xx_mixer_read(chip, 0x7a) & 0x08)
+               ) 
+                       muxSource = 4;
+       }
+       ucontrol->value.enumerated.item[0] = muxSource;
        return 0;
 }
 
 static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
+       static unsigned char map4Source[4] = {0, 2, 6, 7};
        struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
        unsigned char val = ucontrol->value.enumerated.item[0];
-       
-       if (val > 7)
+       unsigned char retVal = 0;
+
+       switch (chip->version) {
+ /* 5 source chips */
+       case 0x1887:
+       case 0x1888:
+               if (val > 4)
+                       return -EINVAL;
+               if (val == 4) {
+                       retVal = snd_es18xx_mixer_bits(chip, 0x7a, 0x08, 0x08) != 0x08;
+                       val = 3;
+               } else
+                       retVal = snd_es18xx_mixer_bits(chip, 0x7a, 0x08, 0x00) != 0x00;
+ /* 4 source chips */
+       case 0x1868:
+       case 0x1878:
+               if (val > 3)
+                       return -EINVAL;
+               val = map4Source[val];
+               break;
+ /* 8 source chips */
+       case 0x1869:
+       case 0x1879:
+               if (val > 7)
+                       return -EINVAL;
+               break;
+       default:
                return -EINVAL;
-       return snd_es18xx_mixer_bits(chip, 0x1c, 0x07, val) != val;
+       }
+       return (snd_es18xx_mixer_bits(chip, 0x1c, 0x07, val) != val) || retVal;
 }
 
 static int snd_es18xx_info_spatializer_enable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
@@ -1183,19 +1288,22 @@ static int snd_es18xx_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e
        return change;
 }
 
+/* Mixer controls
+ * These arrays contain setup data for mixer controls.
+ * 
+ * The controls that are universal to all chipsets are fully initialized
+ * here.
+ */
 static struct snd_kcontrol_new snd_es18xx_base_controls[] = {
 ES18XX_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0),
 ES18XX_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1),
 ES18XX_DOUBLE("Line Playback Volume", 0, 0x3e, 0x3e, 4, 0, 15, 0),
 ES18XX_DOUBLE("CD Playback Volume", 0, 0x38, 0x38, 4, 0, 15, 0),
 ES18XX_DOUBLE("FM Playback Volume", 0, 0x36, 0x36, 4, 0, 15, 0),
-ES18XX_DOUBLE("Mono Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),
 ES18XX_DOUBLE("Mic Playback Volume", 0, 0x1a, 0x1a, 4, 0, 15, 0),
 ES18XX_DOUBLE("Aux Playback Volume", 0, 0x3a, 0x3a, 4, 0, 15, 0),
-ES18XX_SINGLE("PC Speaker Playback Volume", 0, 0x3c, 0, 7, 0),
 ES18XX_SINGLE("Record Monitor", 0, 0xa8, 3, 1, 0),
 ES18XX_DOUBLE("Capture Volume", 0, 0xb4, 0xb4, 4, 0, 15, 0),
-ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
 {
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .name = "Capture Source",
@@ -1205,19 +1313,37 @@ ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
 }
 };
 
-static struct snd_kcontrol_new snd_es18xx_mono_in_control = 
-ES18XX_DOUBLE("Mono Input Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0);
-
 static struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {
 ES18XX_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0),
 ES18XX_DOUBLE("Mic Capture Volume", 0, 0x68, 0x68, 4, 0, 15, 0),
 ES18XX_DOUBLE("Line Capture Volume", 0, 0x6e, 0x6e, 4, 0, 15, 0),
 ES18XX_DOUBLE("FM Capture Volume", 0, 0x6b, 0x6b, 4, 0, 15, 0),
-ES18XX_DOUBLE("Mono Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0),
 ES18XX_DOUBLE("CD Capture Volume", 0, 0x6a, 0x6a, 4, 0, 15, 0),
 ES18XX_DOUBLE("Aux Capture Volume", 0, 0x6c, 0x6c, 4, 0, 15, 0)
 };
 
+/*
+ * The chipset specific mixer controls
+ */
+static struct snd_kcontrol_new snd_es18xx_opt_speaker =
+       ES18XX_SINGLE("PC Speaker Playback Volume", 0, 0x3c, 0, 7, 0);
+
+static struct snd_kcontrol_new snd_es18xx_opt_1869[] = {
+ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
+ES18XX_SINGLE("Video Playback Switch", 0, 0x7f, 0, 1, 0),
+ES18XX_DOUBLE("Mono Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),
+ES18XX_DOUBLE("Mono Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0)
+};
+
+static struct snd_kcontrol_new snd_es18xx_opt_1878 =
+       ES18XX_DOUBLE("Video Playback Volume", 0, 0x68, 0x68, 4, 0, 15, 0);
+
+static struct snd_kcontrol_new snd_es18xx_opt_1879[] = {
+ES18XX_SINGLE("Video Playback Switch", 0, 0x71, 6, 1, 0),
+ES18XX_DOUBLE("Video Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),
+ES18XX_DOUBLE("Video Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0)
+};
+
 static struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {
 ES18XX_DOUBLE("PCM Playback Volume", 0, 0x14, 0x14, 4, 0, 15, 0),
 };
@@ -1262,7 +1388,6 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {
 ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0),
 };
 
-#if 0
 static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
 {
        int data;
@@ -1273,7 +1398,6 @@ static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned ch
         spin_unlock_irqrestore(&chip->ctrl_lock, flags);
        return data;
 }
-#endif
 
 static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, 
                                              unsigned char reg, unsigned char data)
@@ -1419,6 +1543,17 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip)
                snd_es18xx_mixer_write(chip, 0x58, 0x94);
                snd_es18xx_mixer_write(chip, 0x5a, 0x80);
        }
+       /* Flip the "enable I2S" bits for those chipsets that need it */
+       switch (chip->version) {
+       case 0x1879:
+               //Leaving I2S enabled on the 1879 screws up the PCM playback (rate effected somehow)
+               //so a Switch control has been added to toggle this 0x71 bit on/off:
+               //snd_es18xx_mixer_bits(chip, 0x71, 0x40, 0x40);
+               /* Note: we fall through on purpose here. */
+       case 0x1878:
+               snd_es18xx_config_write(chip, 0x29, snd_es18xx_config_read(chip, 0x29) | 0x40);
+               break;
+       }
        /* Mute input source */
        if (chip->caps & ES18XX_MUTEREC)
                mask = 0x10;
@@ -1468,11 +1603,14 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)
        }
                        
         outb(0x40, chip->port + 0x04);
+       udelay(10);
        hi = inb(chip->port + 0x05);
+       udelay(10);
        lo = inb(chip->port + 0x05);
        if (hi != lo) {
                chip->version = hi << 8 | lo;
                chip->ctrl_port = inb(chip->port + 0x05) << 8;
+               udelay(10);
                chip->ctrl_port += inb(chip->port + 0x05);
 
                if ((chip->res_ctrl_port = request_region(chip->ctrl_port, 8, "ES18xx - CTRL")) == NULL) {
@@ -1511,22 +1649,22 @@ static int __devinit snd_es18xx_probe(struct snd_es18xx *chip)
 
        switch (chip->version) {
        case 0x1868:
-               chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL | ES18XX_HWV;
+               chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL;
                break;
        case 0x1869:
                chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_MONO | ES18XX_MUTEREC | ES18XX_CONTROL | ES18XX_HWV;
                break;
        case 0x1878:
-               chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_I2S | ES18XX_CONTROL | ES18XX_HWV;
+               chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_I2S | ES18XX_CONTROL;
                break;
        case 0x1879:
                chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_I2S | ES18XX_CONTROL | ES18XX_HWV;
                break;
        case 0x1887:
-               chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_HWV;
+               chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME;
                break;
        case 0x1888:
-               chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_HWV;
+               chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME;
                break;
        default:
                snd_printk(KERN_ERR "[0x%lx] unsupported chip ES%x\n",
@@ -1573,11 +1711,10 @@ static int __devinit snd_es18xx_pcm(struct snd_es18xx *chip, int device, struct
        if (rpcm)
                *rpcm = NULL;
        sprintf(str, "ES%x", chip->version);
-       if (chip->caps & ES18XX_PCM2) {
+       if (chip->caps & ES18XX_PCM2)
                err = snd_pcm_new(chip->card, str, device, 2, 1, &pcm);
-       } else {
+       else
                err = snd_pcm_new(chip->card, str, device, 1, 1, &pcm);
-       }
         if (err < 0)
                 return err;
 
@@ -1608,7 +1745,10 @@ static int __devinit snd_es18xx_pcm(struct snd_es18xx *chip, int device, struct
 #ifdef CONFIG_PM
 static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state)
 {
-       struct snd_es18xx *chip = card->pm_private_data;
+       struct snd_audiodrive *acard = card->private_data;
+       struct snd_es18xx *chip = acard->chip;
+
+       snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
 
        snd_pcm_suspend_all(chip->pcm);
 
@@ -1623,11 +1763,13 @@ static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state)
 
 static int snd_es18xx_resume(struct snd_card *card)
 {
-       struct snd_es18xx *chip = card->pm_private_data;
+       struct snd_audiodrive *acard = card->private_data;
+       struct snd_es18xx *chip = acard->chip;
 
        /* restore PM register, we won't wake till (not 0x07) i/o activity though */
        snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg ^= ES18XX_PM_FM);
 
+       snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
        return 0;
 }
 #endif /* CONFIG_PM */
@@ -1766,10 +1908,6 @@ static int __devinit snd_es18xx_mixer(struct snd_es18xx *chip)
                }
        }
 
-       if (chip->caps & ES18XX_MONO) {
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_mono_in_control, chip))) < 0)
-                       return err;
-       }
        if (chip->caps & ES18XX_RECMIX) {
                for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_recmix_controls); idx++) {
                        if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_recmix_controls[idx], chip))) < 0)
@@ -1807,6 +1945,36 @@ static int __devinit snd_es18xx_mixer(struct snd_es18xx *chip)
                        
                }
        }
+       /* finish initializing other chipset specific controls
+        */
+       if (chip->version != 0x1868) {
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_opt_speaker,
+                                                    chip));
+               if (err < 0)
+                       return err;
+       }
+       if (chip->version == 0x1869) {
+               for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_opt_1869); idx++) {
+                       err = snd_ctl_add(card,
+                                         snd_ctl_new1(&snd_es18xx_opt_1869[idx],
+                                                      chip));
+                       if (err < 0)
+                               return err;
+               }
+       } else if (chip->version == 0x1878) {
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_opt_1878,
+                                                    chip));
+               if (err < 0)
+                       return err;
+       } else if (chip->version == 0x1879) {
+               for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_opt_1879); idx++) {
+                       err = snd_ctl_add(card,
+                                         snd_ctl_new1(&snd_es18xx_opt_1879[idx],
+                                                      chip));
+                       if (err < 0)
+                               return err;
+               }
+       }
        return 0;
 }
        
@@ -1865,16 +2033,10 @@ MODULE_PARM_DESC(dma1, "DMA 1 # for ES18xx driver.");
 module_param_array(dma2, int, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA 2 # for ES18xx driver.");
 
-struct snd_audiodrive {
-#ifdef CONFIG_PNP
-       struct pnp_dev *dev;
-       struct pnp_dev *devc;
-#endif
-};
-
-static struct snd_card *snd_audiodrive_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+static struct platform_device *platform_devices[SNDRV_CARDS];
 
 #ifdef CONFIG_PNP
+static int pnp_registered;
 
 static struct pnp_card_device_id snd_audiodrive_pnpids[] = {
        /* ESS 1868 (integrated on Compaq dual P-Pro motherboard and Genius 18PnP 3D) */
@@ -1979,227 +2141,285 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard,
 #define is_isapnp_selected(dev)                0
 #endif
 
-static int __devinit snd_audiodrive_probe(int dev, struct pnp_card_link *pcard,
-                                         const struct pnp_card_device_id *pid)
+static struct snd_card *snd_es18xx_card_new(int dev)
 {
-       static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
-       static int possible_dmas[] = {1, 0, 3, 5, -1};
-       int xirq, xdma1, xdma2;
-       struct snd_card *card;
-       struct snd_audiodrive *acard;
+       return snd_card_new(index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_audiodrive));
+}
+
+static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
+{
+       struct snd_audiodrive *acard = card->private_data;
        struct snd_es18xx *chip;
        struct snd_opl3 *opl3;
        int err;
 
-       card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                           sizeof(struct snd_audiodrive));
-       if (card == NULL)
-               return -ENOMEM;
-       acard = (struct snd_audiodrive *)card->private_data;
-#ifdef CONFIG_PNP
-       if (isapnp[dev]) {
-               if ((err = snd_audiodrive_pnp(dev, acard, pcard, pid)) < 0) {
-                       snd_card_free(card);
-                       return err;
-               }
-               snd_card_set_dev(card, &pcard->card->dev);
-       }
-#endif
-
-       xirq = irq[dev];
-       if (xirq == SNDRV_AUTO_IRQ) {
-               if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
-                       snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
-                       err = -EBUSY;
-                       goto _err;
-               }
-       }
-       xdma1 = dma1[dev];
-        if (xdma1 == SNDRV_AUTO_DMA) {
-                if ((xdma1 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
-                       snd_printk(KERN_ERR PFX "unable to find a free DMA1\n");
-                       err = -EBUSY;
-                       goto _err;
-                }
-        }
-       xdma2 = dma2[dev];
-        if (xdma2 == SNDRV_AUTO_DMA) {
-                if ((xdma2 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
-                       snd_printk(KERN_ERR PFX "unable to find a free DMA2\n");
-                       err = -EBUSY;
-                       goto _err;
-                }
-        }
-
        if ((err = snd_es18xx_new_device(card,
                                         port[dev],
                                         mpu_port[dev],
                                         fm_port[dev],
-                                        xirq, xdma1, xdma2,
+                                        irq[dev], dma1[dev], dma2[dev],
                                         &chip)) < 0)
-               goto _err;
+               return err;
+       acard->chip = chip;
 
        sprintf(card->driver, "ES%x", chip->version);
+       
        sprintf(card->shortname, "ESS AudioDrive ES%x", chip->version);
-       if (xdma1 != xdma2)
+       if (dma1[dev] != dma2[dev])
                sprintf(card->longname, "%s at 0x%lx, irq %d, dma1 %d, dma2 %d",
                        card->shortname,
                        chip->port,
-                       xirq, xdma1, xdma2);
+                       irq[dev], dma1[dev], dma2[dev]);
        else
                sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
                        card->shortname,
                        chip->port,
-                       xirq, xdma1);
+                       irq[dev], dma1[dev]);
 
        if ((err = snd_es18xx_pcm(chip, 0, NULL)) < 0)
-               goto _err;
+               return err;
 
        if ((err = snd_es18xx_mixer(chip)) < 0)
-               goto _err;
+               return err;
 
        if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
                if (snd_opl3_create(card, chip->fm_port, chip->fm_port + 2, OPL3_HW_OPL3, 0, &opl3) < 0) {
                        snd_printk(KERN_WARNING PFX "opl3 not detected at 0x%lx\n", chip->fm_port);
                } else {
                        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0)
-                               goto _err;
+                               return err;
                }
        }
 
        if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
                                               chip->mpu_port, 0,
-                                              xirq, 0,
+                                              irq[dev], 0,
                                               &chip->rmidi)) < 0)
-                       goto _err;
+                       return err;
        }
 
-       if ((err = snd_card_set_generic_dev(card)) < 0)
-               goto _err;
-
-       /* Power Management */
-       snd_card_set_isa_pm_callback(card, snd_es18xx_suspend, snd_es18xx_resume, chip);
+       return snd_card_register(card);
+}
 
-       if ((err = snd_card_register(card)) < 0)
-               goto _err;
+static int __init snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devptr)
+{
+       struct snd_card *card;
+       int err;
 
-       if (pcard)
-               pnp_set_card_drvdata(pcard, card);
-       else
-               snd_audiodrive_legacy[dev] = card;
+       card = snd_es18xx_card_new(dev);
+       if (! card)
+               return -ENOMEM;
+       snd_card_set_dev(card, &devptr->dev);
+       if ((err = snd_audiodrive_probe(card, dev)) < 0) {
+               snd_card_free(card);
+               return err;
+       }
+       platform_set_drvdata(devptr, card);
        return 0;
-
- _err:
-       snd_card_free(card);
-       return err;
 }
 
-static int __devinit snd_audiodrive_probe_legacy_port(unsigned long xport)
+static int __init snd_es18xx_nonpnp_probe(struct platform_device *pdev)
 {
-       static int dev;
-       int res;
+       int dev = pdev->id;
+       int err;
+       static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
+       static int possible_dmas[] = {1, 0, 3, 5, -1};
 
-       for ( ; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
-                       continue;
-               if (is_isapnp_selected(dev))
-                       continue;
-               port[dev] = xport;
-               res = snd_audiodrive_probe(dev, NULL, NULL);
-               if (res < 0)
-                       port[dev] = SNDRV_AUTO_PORT;
-               return res;
+       if (irq[dev] == SNDRV_AUTO_IRQ) {
+               if ((irq[dev] = snd_legacy_find_free_irq(possible_irqs)) < 0) {
+                       snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
+                       return -EBUSY;
+               }
+       }
+       if (dma1[dev] == SNDRV_AUTO_DMA) {
+               if ((dma1[dev] = snd_legacy_find_free_dma(possible_dmas)) < 0) {
+                       snd_printk(KERN_ERR PFX "unable to find a free DMA1\n");
+                       return -EBUSY;
+               }
        }
-       return -ENODEV;
+       if (dma2[dev] == SNDRV_AUTO_DMA) {
+               if ((dma2[dev] = snd_legacy_find_free_dma(possible_dmas)) < 0) {
+                       snd_printk(KERN_ERR PFX "unable to find a free DMA2\n");
+                       return -EBUSY;
+               }
+       }
+
+       if (port[dev] != SNDRV_AUTO_PORT) {
+               return snd_es18xx_nonpnp_probe1(dev, pdev);
+       } else {
+               static unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280};
+               int i;
+               for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
+                       port[dev] = possible_ports[i];
+                       err = snd_es18xx_nonpnp_probe1(dev, pdev);
+                       if (! err)
+                               return 0;
+               }
+               return err;
+       }
+}
+
+static int __devexit snd_es18xx_nonpnp_remove(struct platform_device *devptr)
+{
+       snd_card_free(platform_get_drvdata(devptr));
+       platform_set_drvdata(devptr, NULL);
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int snd_es18xx_nonpnp_suspend(struct platform_device *dev, pm_message_t state)
+{
+       return snd_es18xx_suspend(platform_get_drvdata(dev), state);
 }
 
+static int snd_es18xx_nonpnp_resume(struct platform_device *dev)
+{
+       return snd_es18xx_resume(platform_get_drvdata(dev));
+}
+#endif
+
+#define ES18XX_DRIVER  "snd_es18xx"
+
+static struct platform_driver snd_es18xx_nonpnp_driver = {
+       .probe          = snd_es18xx_nonpnp_probe,
+       .remove         = __devexit_p(snd_es18xx_nonpnp_remove),
+#ifdef CONFIG_PM
+       .suspend        = snd_es18xx_nonpnp_suspend,
+       .resume         = snd_es18xx_nonpnp_resume,
+#endif
+       .driver         = {
+               .name   = ES18XX_DRIVER
+       },
+};
+
 
 #ifdef CONFIG_PNP
-static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *card,
-                                              const struct pnp_card_device_id *id)
+static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard,
+                                              const struct pnp_card_device_id *pid)
 {
        static int dev;
+       struct snd_card *card;
        int res;
 
        for ( ; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || !isapnp[dev])
-                       continue;
-                res = snd_audiodrive_probe(dev, card, id);
-               if (res < 0)
-                       return res;
-               dev++;
-               return 0;
-        }
+               if (enable[dev] && isapnp[dev])
+                       break;
+       }
+       if (dev >= SNDRV_CARDS)
+               return -ENODEV;
 
-        return -ENODEV;
+       card = snd_es18xx_card_new(dev);
+       if (! card)
+               return -ENOMEM;
+
+       if ((res = snd_audiodrive_pnp(dev, card->private_data, pcard, pid)) < 0) {
+               snd_card_free(card);
+               return res;
+       }
+       snd_card_set_dev(card, &pcard->card->dev);
+       if ((res = snd_audiodrive_probe(card, dev)) < 0) {
+               snd_card_free(card);
+               return res;
+       }
+
+       pnp_set_card_drvdata(pcard, card);
+       dev++;
+       return 0;
 }
 
 static void __devexit snd_audiodrive_pnp_remove(struct pnp_card_link * pcard)
 {
-       struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
+       snd_card_free(pnp_get_card_drvdata(pcard));
+       pnp_set_card_drvdata(pcard, NULL);
+}
 
-       snd_card_disconnect(card);
-       snd_card_free_in_thread(card);
+#ifdef CONFIG_PM
+static int snd_audiodrive_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)
+{
+       return snd_es18xx_suspend(pnp_get_card_drvdata(pcard), state);
 }
 
+static int snd_audiodrive_pnp_resume(struct pnp_card_link *pcard)
+{
+       return snd_es18xx_resume(pnp_get_card_drvdata(pcard));
+}
+
+#endif
+
 static struct pnp_card_driver es18xx_pnpc_driver = {
        .flags = PNP_DRIVER_RES_DISABLE,
        .name = "es18xx",
        .id_table = snd_audiodrive_pnpids,
        .probe = snd_audiodrive_pnp_detect,
        .remove = __devexit_p(snd_audiodrive_pnp_remove),
+#ifdef CONFIG_PM
+       .suspend        = snd_audiodrive_pnp_suspend,
+       .resume         = snd_audiodrive_pnp_resume,
+#endif
 };
 #endif /* CONFIG_PNP */
 
+static void __init_or_module snd_es18xx_unregister_all(void)
+{
+       int i;
+
+#ifdef CONFIG_PNP
+       if (pnp_registered)
+               pnp_unregister_card_driver(&es18xx_pnpc_driver);
+#endif
+       for (i = 0; i < ARRAY_SIZE(platform_devices); ++i)
+               platform_device_unregister(platform_devices[i]);
+       platform_driver_unregister(&snd_es18xx_nonpnp_driver);
+}
+
 static int __init alsa_card_es18xx_init(void)
 {
-       static unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280, -1};
-       int dev, cards = 0, i;
+       int i, err, cards = 0;
 
-       /* legacy non-auto cards at first */
-       for (dev = 0; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || port[dev] == SNDRV_AUTO_PORT)
-                       continue;
-               if (is_isapnp_selected(dev))
+       if ((err = platform_driver_register(&snd_es18xx_nonpnp_driver)) < 0)
+               return err;
+
+       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+               struct platform_device *device;
+               if (is_isapnp_selected(i))
                        continue;
-               if (snd_audiodrive_probe(dev, NULL, NULL) >= 0)
-                       cards++;
+               device = platform_device_register_simple(ES18XX_DRIVER,
+                                                        i, NULL, 0);
+               if (IS_ERR(device)) {
+                       err = PTR_ERR(device);
+                       goto errout;
+               }
+               platform_devices[i] = device;
+               cards++;
        }
-       /* legacy auto configured cards */
-       i = snd_legacy_auto_probe(possible_ports, snd_audiodrive_probe_legacy_port);
-       if (i > 0)
-               cards += i;
 
 #ifdef CONFIG_PNP
-       /* ISA PnP cards at last */
        i = pnp_register_card_driver(&es18xx_pnpc_driver);
-       if (i > 0)
+       if (i >= 0) {
+               pnp_registered = 1;
                cards += i;
-
+       }
 #endif
+
        if(!cards) {
-#ifdef CONFIG_PNP
-               pnp_unregister_card_driver(&es18xx_pnpc_driver);
-#endif
 #ifdef MODULE
                snd_printk(KERN_ERR "ESS AudioDrive ES18xx soundcard not found or device busy\n");
 #endif
-               return -ENODEV;
+               err = -ENODEV;
+               goto errout;
        }
        return 0;
+
+ errout:
+       snd_es18xx_unregister_all();
+       return err;
 }
 
 static void __exit alsa_card_es18xx_exit(void)
 {
-       int idx;
-
-#ifdef CONFIG_PNP
-       /* PnP cards first */
-       pnp_unregister_card_driver(&es18xx_pnpc_driver);
-#endif
-       for(idx = 0; idx < SNDRV_CARDS; idx++)
-               snd_card_free(snd_audiodrive_legacy[idx]);
+       snd_es18xx_unregister_all();
 }
 
 module_init(alsa_card_es18xx_init)