5 files changed, 1563 insertions, 0 deletions

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index baf18c6afd..1ac20940d8 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1014,6 +1014,23 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     The power-management is supported.
 
+  Module snd-miro
+  ---------------
+
+    Module for Miro soundcards: miroSOUND PCM 1 pro, 
+                                miroSOUND PCM 12,
+                                miroSOUND PCM 20 Radio.
+
+    port        - Port # (0x530,0x604,0xe80,0xf40)
+    irq         - IRQ # (5,7,9,10,11)
+    dma1        - 1st dma # (0,1,3)
+    dma2        - 2nd dma # (0,1)
+    mpu_port    - MPU-401 port # (0x300,0x310,0x320,0x330)
+    mpu_irq     - MPU-401 irq # (5,7,9,10)
+    fm_port     - FM Port # (0x388)
+    wss         - enable WSS mode
+    ide         - enable onboard ide support
+
   Module snd-mixart
   -----------------
 
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index ff8fef9327..2a1c733421 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -292,6 +292,20 @@ config SND_OPTI93X
           To compile this driver as a module, choose M here: the module
           will be called snd-opti93x.
 
+config SND_MIRO
+        tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver"
+        depends on SND
+        select SND_OPL4_LIB
+        select SND_CS4231_LIB
+        select SND_MPU401_UART
+        select SND_PCM
+        help
+          Say 'Y' or 'M' to include support for Miro miroSOUND PCM1 pro, 
+          miroSOUND PCM12 and miroSOUND PCM20 Radio soundcards.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-miro.
+
 config SND_SB8
         tristate "Sound Blaster 1.0/2.0/Pro (8-bit)"
         depends on SND
diff --git a/sound/isa/opti9xx/Makefile b/sound/isa/opti9xx/Makefile
index 28c64070cd..0e41bfd5a4 100644
--- a/sound/isa/opti9xx/Makefile
+++ b/sound/isa/opti9xx/Makefile
@@ -6,8 +6,10 @@
 snd-opti92x-ad1848-objs := opti92x-ad1848.o
 snd-opti92x-cs4231-objs := opti92x-cs4231.o
 snd-opti93x-objs := opti93x.o
+snd-miro-objs := miro.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-opti92x-ad1848.o
 obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-opti92x-cs4231.o
 obj-$(CONFIG_SND_OPTI93X) += snd-opti93x.o
+obj-$(CONFIG_SND_MIRO) += snd-miro.o
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
new file mode 100644
index 0000000000..49ba334c0d
--- /dev/null
+++ b/sound/isa/opti9xx/miro.c
@@ -0,0 +1,1457 @@
+/*
+ *   ALSA soundcard driver for Miro miroSOUND PCM1 pro
+ *                                  miroSOUND PCM12
+ *                                  miroSOUND PCM20 Radio
+ *
+ *   Copyright (C) 2004-2005 Martin Langer <martin-langer@gmx.de>
+ *
+ *   Based on OSS ACI and ALSA OPTi9xx drivers
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/moduleparam.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <sound/core.h>
+#include <sound/cs4231.h>
+#include <sound/mpu401.h>
+#include <sound/opl4.h>
+#include <sound/control.h>
+#include <sound/info.h>
+#define SNDRV_LEGACY_FIND_FREE_IRQ
+#define SNDRV_LEGACY_FIND_FREE_DMA
+#include <sound/initval.h>
+#include "miro.h"
+
+MODULE_AUTHOR("Martin Langer <martin-langer@gmx.de>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Miro miroSOUND PCM1 pro, PCM12, PCM20 Radio");
+MODULE_SUPPORTED_DEVICE("{{Miro,miroSOUND PCM1 pro}, "
+                        "{Miro,miroSOUND PCM12}, "
+                        "{Miro,miroSOUND PCM20 Radio}}");
+
+static int index = SNDRV_DEFAULT_IDX1;          /* Index 0-MAX */
+static char *id = SNDRV_DEFAULT_STR1;           /* ID for this card */
+static long port = SNDRV_DEFAULT_PORT1;         /* 0x530,0xe80,0xf40,0x604 */
+static long mpu_port = SNDRV_DEFAULT_PORT1;     /* 0x300,0x310,0x320,0x330 */
+static long fm_port = SNDRV_DEFAULT_PORT1;      /* 0x388 */
+static int irq = SNDRV_DEFAULT_IRQ1;            /* 5,7,9,10,11 */
+static int mpu_irq = SNDRV_DEFAULT_IRQ1;        /* 5,7,9,10 */
+static int dma1 = SNDRV_DEFAULT_DMA1;           /* 0,1,3 */
+static int dma2 = SNDRV_DEFAULT_DMA1;           /* 0,1,3 */
+static int wss;
+static int ide;
+
+module_param(index, int, 0444);
+MODULE_PARM_DESC(index, "Index value for miro soundcard.");
+module_param(id, charp, 0444);
+MODULE_PARM_DESC(id, "ID string for miro soundcard.");
+module_param(port, long, 0444);
+MODULE_PARM_DESC(port, "WSS port # for miro driver.");
+module_param(mpu_port, long, 0444);
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for miro driver.");
+module_param(fm_port, long, 0444);
+MODULE_PARM_DESC(fm_port, "FM Port # for miro driver.");
+module_param(irq, int, 0444);
+MODULE_PARM_DESC(irq, "WSS irq # for miro driver.");
+module_param(mpu_irq, int, 0444);
+MODULE_PARM_DESC(mpu_irq, "MPU-401 irq # for miro driver.");
+module_param(dma1, int, 0444);
+MODULE_PARM_DESC(dma1, "1st dma # for miro driver.");
+module_param(dma2, int, 0444);
+MODULE_PARM_DESC(dma2, "2nd dma # for miro driver.");
+module_param(wss, int, 0444);
+MODULE_PARM_DESC(wss, "wss mode");
+module_param(ide, int, 0444);
+MODULE_PARM_DESC(ide, "enable ide port");
+
+#define OPTi9XX_HW_DETECT       0
+#define OPTi9XX_HW_82C928       1
+#define OPTi9XX_HW_82C929       2
+#define OPTi9XX_HW_82C924       3
+#define OPTi9XX_HW_82C925       4
+#define OPTi9XX_HW_82C930       5
+#define OPTi9XX_HW_82C931       6
+#define OPTi9XX_HW_82C933       7
+#define OPTi9XX_HW_LAST         OPTi9XX_HW_82C933
+
+#define OPTi9XX_MC_REG(n)       n
+
+
+struct snd_miro {
+        unsigned short hardware;
+        unsigned char password;
+        char name[7];
+
+        struct resource *res_mc_base;
+        struct resource *res_aci_port;
+
+        unsigned long mc_base;
+        unsigned long mc_base_size;
+        unsigned long pwd_reg;
+
+        spinlock_t lock;
+        struct snd_card *card;
+        struct snd_pcm *pcm;
+
+        long wss_base;
+        int irq;
+        int dma1;
+        int dma2;
+
+        long fm_port;
+
+        long mpu_port;
+        int mpu_irq;
+
+        unsigned long aci_port;
+        int aci_vendor;
+        int aci_product;
+        int aci_version;
+        int aci_amp;
+        int aci_preamp;
+        int aci_solomode;
+
+        struct mutex aci_mutex;
+};
+
+static void snd_miro_proc_init(struct snd_miro * miro);
+
+#define DRIVER_NAME "snd-miro"
+
+static struct platform_device *device;
+
+static char * snd_opti9xx_names[] = {
+        "unkown",
+        "82C928", "82C929",
+        "82C924", "82C925",