Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

15 files changed, 900 insertions, 391 deletions

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index c6990c680796..52064cfa91f3 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -77,6 +77,32 @@ config SND_ALS100
           To compile this driver as a module, choose M here: the module
           will be called snd-als100.
 
+config SND_AZT1605
+        tristate "Aztech AZT1605 Driver"
+        depends on SND
+        select SND_WSS_LIB
+        select SND_MPU401_UART
+        select SND_OPL3_LIB
+        help
+          Say Y here to include support for Aztech Sound Galaxy cards
+          based on the AZT1605 chipset.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-azt1605.
+
+config SND_AZT2316
+        tristate "Aztech AZT2316 Driver"
+        depends on SND
+        select SND_WSS_LIB
+        select SND_MPU401_UART
+        select SND_OPL3_LIB
+        help
+          Say Y here to include support for Aztech Sound Galaxy cards
+          based on the AZT2316 chipset.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-azt2316.
+
 config SND_AZT2320
         tristate "Aztech Systems AZT2320"
         depends on PNP
@@ -351,16 +377,6 @@ config SND_SB16_CSP
           coprocessor can do variable tasks like various compression and
           decompression algorithms.
 
-config SND_SGALAXY
-        tristate "Aztech Sound Galaxy"
-        select SND_WSS_LIB
-        help
-          Say Y here to include support for Aztech Sound Galaxy
-          soundcards.
-
-          To compile this driver as a module, choose M here: the module
-          will be called snd-sgalaxy.
-
 config SND_SSCAPE
         tristate "Ensoniq SoundScape driver"
         select SND_MPU401_UART
diff --git a/sound/isa/Makefile b/sound/isa/Makefile
index c73d30c4f462..8d781e419e2e 100644
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
@@ -10,7 +10,6 @@ snd-cmi8330-objs := cmi8330.o
 snd-es18xx-objs := es18xx.o
 snd-opl3sa2-objs := opl3sa2.o
 snd-sc6000-objs := sc6000.o
-snd-sgalaxy-objs := sgalaxy.o
 snd-sscape-objs := sscape.o
 
 # Toplevel Module Dependency
@@ -21,8 +20,7 @@ obj-$(CONFIG_SND_CMI8330) += snd-cmi8330.o
 obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o
 obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o
 obj-$(CONFIG_SND_SC6000) += snd-sc6000.o
-obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
 obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o
 
-obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ msnd/ opti9xx/ \
+obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ galaxy/ gus/ msnd/ opti9xx/ \
                      sb/ wavefront/ wss/
diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index bbcbf92a8ebe..3cb75bc97699 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -162,7 +162,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
                                 sizeof(struct snd_card_ad1816a), &card);
         if (error < 0)
                 return error;
-        acard = (struct snd_card_ad1816a *)card->private_data;
+        acard = card->private_data;
 
         if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {
                 snd_card_free(card);
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index f7aa637b0d18..aac8dc15c2fe 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -188,7 +188,7 @@ static int __devinit snd_card_azt2320_probe(int dev,
                                 sizeof(struct snd_card_azt2320), &card);
         if (error < 0)
                 return error;
-        acard = (struct snd_card_azt2320 *)card->private_data;
+        acard = card->private_data;
 
         if ((error = snd_card_azt2320_pnp(dev, acard, pcard, pid))) {
                 snd_card_free(card);
diff --git a/sound/isa/galaxy/Makefile b/sound/isa/galaxy/Makefile
new file mode 100644
index 000000000000..e307066d4315
--- /dev/null
+++ b/sound/isa/galaxy/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for ALSA
+# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+#
+
+snd-azt1605-objs := azt1605.o
+snd-azt2316-objs := azt2316.o
+
+obj-$(CONFIG_SND_AZT1605) += snd-azt1605.o
+obj-$(CONFIG_SND_AZT2316) += snd-azt2316.o
diff --git a/sound/isa/galaxy/azt1605.c b/sound/isa/galaxy/azt1605.c
new file mode 100644
index 000000000000..9a97643cb713
--- /dev/null
+++ b/sound/isa/galaxy/azt1605.c
@@ -0,0 +1,91 @@
+/*
+ * Aztech AZT1605 Driver
+ * Copyright (C) 2007,2010  Rene Herman
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#define AZT1605
+
+#define CRD_NAME "Aztech AZT1605"
+#define DRV_NAME "AZT1605"
+#define DEV_NAME "azt1605"
+
+#define GALAXY_DSP_MAJOR                2
+#define GALAXY_DSP_MINOR                1
+
+#define GALAXY_CONFIG_SIZE              3
+
+/*
+ * 24-bit config register
+ */
+
+#define GALAXY_CONFIG_SBA_220           (0 << 0)
+#define GALAXY_CONFIG_SBA_240           (1 << 0)
+#define GALAXY_CONFIG_SBA_260           (2 << 0)
+#define GALAXY_CONFIG_SBA_280           (3 << 0)
+#define GALAXY_CONFIG_SBA_MASK          GALAXY_CONFIG_SBA_280
+
+#define GALAXY_CONFIG_MPUA_300          (0 << 2)
+#define GALAXY_CONFIG_MPUA_330          (1 << 2)
+
+#define GALAXY_CONFIG_MPU_ENABLE        (1 << 3)
+
+#define GALAXY_CONFIG_GAME_ENABLE       (1 << 4)
+
+#define GALAXY_CONFIG_CD_PANASONIC      (1 << 5)
+#define GALAXY_CONFIG_CD_MITSUMI        (1 << 6)
+#define GALAXY_CONFIG_CD_MASK           (\
+        GALAXY_CONFIG_CD_PANASONIC | GALAXY_CONFIG_CD_MITSUMI)
+
+#define GALAXY_CONFIG_UNUSED            (1 << 7)
+#define GALAXY_CONFIG_UNUSED_MASK       GALAXY_CONFIG_UNUSED
+
+#define GALAXY_CONFIG_SBIRQ_2           (1 << 8)
+#define GALAXY_CONFIG_SBIRQ_3           (1 << 9)
+#define GALAXY_CONFIG_SBIRQ_5           (1 << 10)
+#define GALAXY_CONFIG_SBIRQ_7           (1 << 11)
+
+#define GALAXY_CONFIG_MPUIRQ_2          (1 << 12)
+#define GALAXY_CONFIG_MPUIRQ_3          (1 << 13)
+#define GALAXY_CONFIG_MPUIRQ_5          (1 << 14)
+#define GALAXY_CONFIG_MPUIRQ_7          (1 << 15)
+
+#define GALAXY_CONFIG_WSSA_530          (0 << 16)
+#define GALAXY_CONFIG_WSSA_604          (1 << 16)
+#define GALAXY_CONFIG_WSSA_E80          (2 << 16)
+#define GALAXY_CONFIG_WSSA_F40          (3 << 16)
+
+#define GALAXY_CONFIG_WSS_ENABLE        (1 << 18)
+
+#define GALAXY_CONFIG_CDIRQ_11          (1 << 19)
+#define GALAXY_CONFIG_CDIRQ_12          (1 << 20)
+#define GALAXY_CONFIG_CDIRQ_15          (1 << 21)
+#define GALAXY_CONFIG_CDIRQ_MASK        (\
+        GALAXY_CONFIG_CDIRQ_11 | GALAXY_CONFIG_CDIRQ_12 |\
+        GALAXY_CONFIG_CDIRQ_15)
+
+#define GALAXY_CONFIG_CDDMA_DISABLE     (0 << 22)
+#define GALAXY_CONFIG_CDDMA_0           (1 << 22)
+#define GALAXY_CONFIG_CDDMA_1           (2 << 22)
+#define GALAXY_CONFIG_CDDMA_3           (3 << 22)
+#define GALAXY_CONFIG_CDDMA_MASK        GALAXY_CONFIG_CDDMA_3
+
+#define GALAXY_CONFIG_MASK              (\
+        GALAXY_CONFIG_SBA_MASK | GALAXY_CONFIG_CD_MASK |\
+        GALAXY_CONFIG_UNUSED_MASK | GALAXY_CONFIG_CDIRQ_MASK |\
+        GALAXY_CONFIG_CDDMA_MASK)
+
+#include "galaxy.c"
diff --git a/sound/isa/galaxy/azt2316.c b/sound/isa/galaxy/azt2316.c
new file mode 100644
index 000000000000..189441141df6
--- /dev/null
+++ b/sound/isa/galaxy/azt2316.c
@@ -0,0 +1,111 @@
+/*
+ * Aztech AZT2316 Driver
+ * Copyright (C) 2007,2010  Rene Herman
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#define AZT2316
+
+#define CRD_NAME "Aztech AZT2316"
+#define DRV_NAME "AZT2316"
+#define DEV_NAME "azt2316"
+
+#define GALAXY_DSP_MAJOR                3
+#define GALAXY_DSP_MINOR                1
+
+#define GALAXY_CONFIG_SIZE              4
+
+/*
+ * 32-bit config register
+ */
+
+#define GALAXY_CONFIG_SBA_220           (0 << 0)
+#define GALAXY_CONFIG_SBA_240           (1 << 0)
+#define GALAXY_CONFIG_SBA_260           (2 << 0)
+#define GALAXY_CONFIG_SBA_280           (3 << 0)
+#define GALAXY_CONFIG_SBA_MASK          GALAXY_CONFIG_SBA_280
+
+#define GALAXY_CONFIG_SBIRQ_2           (1 << 2)
+#define GALAXY_CONFIG_SBIRQ_5           (1 << 3)
+#define GALAXY_CONFIG_SBIRQ_7           (1 << 4)
+#define GALAXY_CONFIG_SBIRQ_10          (1 << 5)
+
+#define GALAXY_CONFIG_SBDMA_DISABLE     (0 << 6)
+#define GALAXY_CONFIG_SBDMA_0           (1 << 6)
+#define GALAXY_CONFIG_SBDMA_1           (2 << 6)
+#define GALAXY_CONFIG_SBDMA_3           (3 << 6)
+
+#define GALAXY_CONFIG_WSSA_530          (0 << 8)
+#define GALAXY_CONFIG_WSSA_604          (1 << 8)
+#define GALAXY_CONFIG_WSSA_E80          (2 << 8)
+#define GALAXY_CONFIG_WSSA_F40          (3 << 8)
+
+#define GALAXY_CONFIG_WSS_ENABLE        (1 << 10)
+
+#define GALAXY_CONFIG_GAME_ENABLE       (1 << 11)
+
+#define GALAXY_CONFIG_MPUA_300          (0 << 12)
+#define GALAXY_CONFIG_MPUA_330          (1 << 12)
+
+#define GALAXY_CONFIG_MPU_ENABLE        (1 << 13)
+
+#define GALAXY_CONFIG_CDA_310           (0 << 14)
+#define GALAXY_CONFIG_CDA_320           (1 << 14)
+#define GALAXY_CONFIG_CDA_340           (2 << 14)
+#define GALAXY_CONFIG_CDA_350           (3 << 14)
+#define GALAXY_CONFIG_CDA_MASK          GALAXY_CONFIG_CDA_350
+
+#define GALAXY_CONFIG_CD_DISABLE        (0 << 16)
+#define GALAXY_CONFIG_CD_PANASONIC      (1 << 16)
+#define GALAXY_CONFIG_CD_SONY           (2 << 16)
+#define GALAXY_CONFIG_CD_MITSUMI        (3 << 16)
+#define GALAXY_CONFIG_CD_AZTECH         (4 << 16)
+#define GALAXY_CONFIG_CD_UNUSED_5       (5 << 16)
+#define GALAXY_CONFIG_CD_UNUSED_6       (6 << 16)
+#define GALAXY_CONFIG_CD_UNUSED_7       (7 << 16)
+#define GALAXY_CONFIG_CD_MASK           GALAXY_CONFIG_CD_UNUSED_7
+
+#define GALAXY_CONFIG_CDDMA8_DISABLE    (0 << 20)
+#define GALAXY_CONFIG_CDDMA8_0          (1 << 20)
+#define GALAXY_CONFIG_CDDMA8_1          (2 << 20)
+#define GALAXY_CONFIG_CDDMA8_3          (3 << 20)
+#define GALAXY_CONFIG_CDDMA8_MASK       GALAXY_CONFIG_CDDMA8_3
+
+#define GALAXY_CONFIG_CDDMA16_DISABLE   (0 << 22)
+#define GALAXY_CONFIG_CDDMA16_5         (1 << 22)
+#define GALAXY_CONFIG_CDDMA16_6         (2 << 22)
+#define GALAXY_CONFIG_CDDMA16_7         (3 << 22)
+#define GALAXY_CONFIG_CDDMA16_MASK      GALAXY_CONFIG_CDDMA16_7
+
+#define GALAXY_CONFIG_MPUIRQ_2          (1 << 24)
+#define GALAXY_CONFIG_MPUIRQ_5          (1 << 25)
+#define GALAXY_CONFIG_MPUIRQ_7          (1 << 26)
+#define GALAXY_CONFIG_MPUIRQ_10         (1 << 27)
+
+#define GALAXY_CONFIG_CDIRQ_5           (1 << 28)
+#define GALAXY_CONFIG_CDIRQ_11          (1 << 29)
+#define GALAXY_CONFIG_CDIRQ_12          (1 << 30)
+#define GALAXY_CONFIG_CDIRQ_15          (1 << 31)
+#define GALAXY_CONFIG_CDIRQ_MASK        (\
+        GALAXY_CONFIG_CDIRQ_5 | GALAXY_CONFIG_CDIRQ_11 |\
+        GALAXY_CONFIG_CDIRQ_12 | GALAXY_CONFIG_CDIRQ_15)
+
+#define GALAXY_CONFIG_MASK              (\
+        GALAXY_CONFIG_SBA_MASK | GALAXY_CONFIG_CDA_MASK |\
+        GALAXY_CONFIG_CD_MASK | GALAXY_CONFIG_CDDMA16_MASK |\
+        GALAXY_CONFIG_CDDMA8_MASK | GALAXY_CONFIG_CDIRQ_MASK)
+
+#include "galaxy.c"
diff --git a/sound/isa/galaxy/galaxy.c b/sound/isa/galaxy/galaxy.c
new file mode 100644
index 000000000000..ee54df082b9c
--- /dev/null
+++ b/sound/isa/galaxy/galaxy.c
@@ -0,0 +1,652 @@
+/*
+ * Aztech AZT1605/AZT2316 Driver
+ * Copyright (C) 2007,2010  Rene Herman
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/isa.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <asm/processor.h>
+#include <sound/core.h>
+#include <sound/initval.h>
+#include <sound/wss.h>
+#include <sound/mpu401.h>
+#include <sound/opl3.h>
+
+MODULE_DESCRIPTION(CRD_NAME);
+MODULE_AUTHOR("Rene Herman");
+MODULE_LICENSE("GPL");
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for " CRD_NAME " soundcard.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
+
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static long wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
+static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+
+module_param_array(port, long, NULL, 0444);
+MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
+module_param_array(wss_port, long, NULL, 0444);
+MODULE_PARM_DESC(wss_port, "WSS port # for " CRD_NAME " driver.");
+module_param_array(mpu_port, long, NULL, 0444);
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");
+module_param_array(fm_port, long, NULL, 0444);
+MODULE_PARM_DESC(fm_port, "FM port # for " CRD_NAME " driver.");
+module_param_array(irq, int, NULL, 0444);
+MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
+module_param_array(mpu_irq, int, NULL, 0444);
+MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
+module_param_array(dma1, int, NULL, 0444);
+MODULE_PARM_DESC(dma1, "Playback DMA # for " CRD_NAME " driver.");
+module_param_array(dma2, int, NULL, 0444);
+MODULE_PARM_DESC(dma2, "Capture DMA # for " CRD_NAME " driver.");
+
+/*
+ * Generic SB DSP support routines
+ */
+
+#define DSP_PORT_RESET          0x6
+#define DSP_PORT_READ           0xa
+#define DSP_PORT_COMMAND        0xc
+#define DSP_PORT_STATUS         0xc
+#define DSP_PORT_DATA_AVAIL     0xe
+
+#define DSP_SIGNATURE           0xaa
+
+#define DSP_COMMAND_GET_VERSION 0xe1
+
+static int __devinit dsp_get_byte(void __iomem *port, u8 *val)
+{
+        int loops = 1000;
+
+        while (!(ioread8(port + DSP_PORT_DATA_AVAIL) & 0x80)) {
+                if (!loops--)
+                        return -EIO;
+                cpu_relax();
+        }
+        *val = ioread8(port + DSP_PORT_READ);
+        return 0;
+}
+
+static int __devinit dsp_reset(void __iomem *port)
+{
+        u8 val;
+
+        iowrite8(1, port + DSP_PORT_RESET);
+        udelay(10);
+        iowrite8(0, port + DSP_PORT_RESET);
+
+        if (dsp_get_byte(port, &val) < 0 || val != DSP_SIGNATURE)
+                return -ENODEV;
+
+        return 0;
+}
+
+static int __devinit dsp_command(void __iomem *port, u8 cmd)
+{
+        int loops = 1000;
+
+        while (ioread8(port + DSP_PORT_STATUS) & 0x80) {
+                if (!loops--)
+                        return -EIO;
+                cpu_relax();
+        }
+        iowrite8(cmd, port + DSP_PORT_COMMAND);
+        return 0;
+}
+
+static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor)
+{
+        int err;
+
+        err = dsp_command(port, DSP_COMMAND_GET_VERSION);
+        if (err < 0)
+                return err;
+
+        err = dsp_get_byte(port, major);
+        if (err < 0)
+                return err;
+
+        err = dsp_get_byte(port, minor);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+/*
+ * Generic WSS support routines
+ */
+
+#define WSS_CONFIG_DMA_0        (1 << 0)
+#define WSS_CONFIG_DMA_1        (2 << 0)
+#define WSS_CONFIG_DMA_3        (3 << 0)
+#define WSS_CONFIG_DUPLEX       (1 << 2)
+#define WSS_CONFIG_IRQ_7        (1 << 3)
+#define WSS_CONFIG_IRQ_9        (2 << 3)
+#define WSS_CONFIG_IRQ_10       (3 << 3)
+#define WSS_CONFIG_IRQ_11       (4 << 3)
+
+#define WSS_PORT_CONFIG         0
+#define WSS_PORT_SIGNATURE      3
+
+#define WSS_SIGNATURE           4
+
+static int __devinit wss_detect(void __iomem *wss_port)
+{
+        if ((ioread8(wss_port + WSS_PORT_SIGNATURE) & 0x3f) != WSS_SIGNATURE)
+                return -ENODEV;
+
+        return 0;
+}
+
+static void wss_set_config(void __iomem *wss_port, u8 wss_config)
+{
+        iowrite8(wss_config, wss_port + WSS_PORT_CONFIG);
+}
+
+/*
+ * Aztech Sound Galaxy specifics
+ */
+
+#define GALAXY_PORT_CONFIG      1024
+#define CONFIG_PORT_SET         4
+
+#define DSP_COMMAND_GALAXY_8    8
+#define GALAXY_COMMAND_GET_TYPE 5
+
+#define DSP_COMMAND_GALAXY_9    9
+#define GALAXY_COMMAND_WSSMODE  0
+#define GALAXY_COMMAND_SB8MODE  1
+
+#define GALAXY_MODE_WSS         GALAXY_COMMAND_WSSMODE
+#define GALAXY_MODE_SB8         GALAXY_COMMAND_SB8MODE
+
+struct snd_galaxy {
+        void __iomem *port;
+        void __iomem *config_port;
+        void __iomem *wss_port;
+        u32 config;
+        struct resource *res_port;
+        struct resource *res_config_port;
+        struct resource *res_wss_port;
+};
+
+static u32 config[SNDRV_CARDS];
+static u8 wss_config[SNDRV_CARDS];
+
+static int __devinit snd_galaxy_match(struct device *dev, unsigned int n)
+{
+        if (!enable[n])
+                return 0;
+
+        switch (port[n]) {
+        case SNDRV_AUTO_PORT:
+                dev_err(dev, "please specify port\n");
+                return 0;
+        case 0x220:
+                config[n] |= GALAXY_CONFIG_SBA_220;
+                break;
+        case 0x240:
+                config[n] |= GALAXY_CONFIG_SBA_240;
+                break;
+        case 0x260:
+                config[n] |= GALAXY_CONFIG_SBA_260;
+                break;
+        case 0x280:
+                config[n] |= GALAXY_CONFIG_SBA_280;
+                break;
+        default:
+                dev_err(dev, "invalid port %#lx\n", port[n]);
+                return 0;
+        }
+
+        switch (wss_port[n]) {
+        case SNDRV_AUTO_PORT:
+                dev_err(dev,  "please specify wss_port\n");
+                return 0;
+        case 0x530:
+                config[n] |= GALAXY_CONFIG_WSS_ENABLE | GALAXY_CONFIG_WSSA_530;
+                break;
+        case 0x604:
+                config[n] |= GALAXY_CONFIG_WSS_ENABLE | GALAXY_CONFIG_WSSA_604;
+                break;
+        case 0xe80:
+                config[n] |= GALAXY_CONFIG_WSS_ENABLE | GALAXY_CONFIG_WSSA_E80;
+                break;
+        case 0xf40:
+                config[n] |= GALAXY_CONFIG_WSS_ENABLE | GALAXY_CONFIG_WSSA_F40;
+                break;
+        default:
+                dev_err(dev, "invalid WSS port %#lx\n", wss_port[n]);
+                return 0;
+        }
+
+        switch (irq[n]) {
+        case SNDRV_AUTO_IRQ:
+                dev_err(dev,  "please specify irq\n");
+                return 0;
+        case 7:
+                wss_config[n] |= WSS_CONFIG_IRQ_7;
+                break;
+        case 2:
+                irq[n] = 9;
+        case 9:
+                wss_config[n] |= WSS_CONFIG_IRQ_9;
+                break;
+        case 10:
+                wss_config[n] |= WSS_CONFIG_IRQ_10;
+                break;
+        case 11:
+                wss_config[n] |= WSS_CONFIG_IRQ_11;
+                break;
+        default:
+                dev_err(dev, "invalid IRQ %d\n", irq[n]);
+                return 0;
+        }
+
+        switch (dma1[n]) {
+        case SNDRV_AUTO_DMA:
+                dev_err(dev,  "please specify dma1\n");
+                return 0;
+        case 0:
+                wss_config[n] |= WSS_CONFIG_DMA_0;
+                break;
+        case 1:
+                wss_config[n] |= WSS_CONFIG_DMA_1;
+                break;
+        case 3:
+                wss_config[n] |= WSS_CONFIG_DMA_3;
+                break;
+        default:
+                dev_err(dev, "invalid playback DMA %d\n", dma1[n]);
+                return 0;
+        }
+
+        if (dma2[n] == SNDRV_AUTO_DMA || dma2[n] == dma1[n]) {
+                dma2[n] = -1;
+                goto mpu;
+        }
+
+        wss_config[n] |= WSS_CONFIG_DUPLEX;
+        switch (dma2[n]) {
+        case 0:
+                break;
+        case 1:
+                if (dma1[n] == 0)
+                        break;
+        default:
+                dev_err(dev, "invalid capture DMA %d\n", dma2[n]);
+                return 0;
+        }
+
+mpu:
+        switch (mpu_port[n]) {
+        case SNDRV_AUTO_PORT:
+                dev_warn(dev, "mpu_port not specified; not using MPU-401\n");
+                mpu_port[n] = -1;
+                goto fm;
+        case 0x300:
+                config[n] |= GALAXY_CONFIG_MPU_ENABLE | GALAXY_CONFIG_MPUA_300;
+                break;
+        case 0x330:
+                config[n] |= GALAXY_CONFIG_MPU_ENABLE | GALAXY_CONFIG_MPUA_330;
+                break;
+        default:
+                dev_err(dev, "invalid MPU port %#lx\n", mpu_port[n]);
+                return 0;
+        }
+
+        switch (mpu_irq[n]) {
+        case SNDRV_AUTO_IRQ:
+                dev_warn(dev, "mpu_irq not specified: using polling mode\n");
+                mpu_irq[n] = -1;
+                break;
+        case 2:
+                mpu_irq[n] = 9;
+        case 9:
+                config[n] |= GALAXY_CONFIG_MPUIRQ_2;
+                break;
+#ifdef AZT1605
+        case 3:
+                config[n] |= GALAXY_CONFIG_MPUIRQ_3;
+                break;
+#endif
+        case 5:
+                config[n] |= GALAXY_CONFIG_MPUIRQ_5;
+                break;
+        case 7:
+                config[n] |= GALAXY_CONFIG_MPUIRQ_7;
+                break;
+#ifdef AZT2316
+        case 10:
+                config[n] |= GALAXY_CONFIG_MPUIRQ_10;
+                break;
+#endif
+        default:
+                dev_err(dev, "invalid MPU IRQ %d\n", mpu_irq[n]);
+                return 0;
+        }
+
+        if (mpu_irq[n] == irq[n]) {
+                dev_err(dev, "cannot share IRQ between WSS and MPU-401\n");
+                return 0;
+        }
+
+fm:
+        switch (fm_port[n]) {
+        case SNDRV_AUTO_PORT:
+                dev_warn(dev, "fm_port not specified: not using OPL3\n");
+                fm_port[n] = -1;
+                break;
+        case 0x388:
+                break;
+        default:
+                dev_err(dev, "illegal FM port %#lx\n", fm_port[n]);
+                return 0;
+        }
+
+        config[n] |= GALAXY_CONFIG_GAME_ENABLE;
+        return 1;
+}
+
+static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type)
+{
+        u8 major;
+        u8 minor;
+        int err;
+
+        err = dsp_reset(galaxy->port);
+        if (err < 0)
+                return err;
+
+        err = dsp_get_version(galaxy->port, &major, &minor);
+        if (err < 0)
+                return err;
+
+        if (major != GALAXY_DSP_MAJOR || minor != GALAXY_DSP_MINOR)
+                return -ENODEV;
+
+        err = dsp_command(galaxy->port, DSP_COMMAND_GALAXY_8);
+        if (err < 0)
+                return err;
+
+        err = dsp_command(galaxy->port, GALAXY_COMMAND_GET_TYPE);
+        if (err < 0)
+                return err;
+
+        err = dsp_get_byte(galaxy->port, type);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+static int __devinit galaxy_set_mode(struct snd_galaxy *galaxy, u8 mode)
+{
+        int err;
+
+        err = dsp_command(galaxy->port, DSP_COMMAND_GALAXY_9);
+        if (err < 0)
+                return err;
+
+        err = dsp_command(galaxy->port, mode);
+        if (err < 0)
+                return err;
+
+#ifdef AZT1605
+        /*
+         * Needed for MPU IRQ on AZT1605, but AZT2316 loses WSS again
+         */
+        err = dsp_reset(galaxy->port);
+        if (err < 0)
+                return err;
+#endif
+
+        return 0;
+}
+
+static void galaxy_set_config(struct snd_galaxy *galaxy, u32 config)
+{
+        u8 tmp = ioread8(galaxy->config_port + CONFIG_PORT_SET);
+        int i;
+
+        iowrite8(tmp | 0x80, galaxy->config_port + CONFIG_PORT_SET);
+        for (i = 0; i < GALAXY_CONFIG_SIZE; i++) {
+                iowrite8(config, galaxy->config_port + i);
+                config >>= 8;
+        }
+        iowrite8(tmp & 0x7f, galaxy->config_port + CONFIG_PORT_SET);
+        msleep(10);
+}
+
+static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config)
+{
+        int i;
+
+        for (i = GALAXY_CONFIG_SIZE; i; i--) {
+                u8 tmp = ioread8(galaxy->config_port + i - 1);
+                galaxy->config = (galaxy->config << 8) | tmp;
+        }
+        config |= galaxy->config & GALAXY_CONFIG_MASK;
+        galaxy_set_config(galaxy, config);
+}
+
+static int __devinit galaxy_wss_config(struct snd_galaxy *galaxy, u8 wss_config)
+{
+        int err;
+
+        err = wss_detect(galaxy->wss_port);
+        if (err < 0)
+                return err;
+
+        wss_set_config(galaxy->wss_port, wss_config);
+
+        err = galaxy_set_mode(galaxy, GALAXY_MODE_WSS);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+static void snd_galaxy_free(struct snd_card *card)
+{
+        struct snd_galaxy *galaxy = card->private_data;
+
+        if (galaxy->wss_port) {
+                wss_set_config(galaxy->wss_port, 0);
+                ioport_unmap(galaxy->wss_port);
+                release_and_free_resource(galaxy->res_wss_port);
+        }
+        if (galaxy->config_port) {
+                galaxy_set_config(galaxy, galaxy->config);
+                ioport_unmap(galaxy->config_port);
+                release_and_free_resource(galaxy->res_config_port);
+        }
+        if (galaxy->port) {
+                ioport_unmap(galaxy->port);
+                release_and_free_resource(galaxy->res_port);
+        }
+}
+
+static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n)
+{
+        struct snd_galaxy *galaxy;
+        struct snd_wss *chip;
+        struct snd_card *card;
+        u8 type;
+        int err;
+
+        err = snd_card_create(index[n], id[n], THIS_MODULE, sizeof *galaxy,
+                              &card);
+        if (err < 0)
+                return err;
+
+        snd_card_set_dev(card, dev);
+
+        card->private_free = snd_galaxy_free;
+        galaxy = card->private_data;
+
+        galaxy->res_port = request_region(port[n], 16, DRV_NAME);
+        if (!galaxy->res_port) {
+                dev_err(dev, "could not grab ports %#lx-%#lx\n", port[n],
+                        port[n] + 15);
+                err = -EBUSY;
+                goto error;
+        }
+        galaxy->port = ioport_map(port[n], 16);
+
+        err = galaxy_init(galaxy, &type);
+        if (err < 0) {
+                dev_err(dev, "did not find a Sound Galaxy at %#lx\n", port[n]);
+                goto error;
+        }
+        dev_info(dev, "Sound Galaxy (type %d) found at %#lx\n", type, port[n]);
+
+        galaxy->res_config_port = request_region(port[n] + GALAXY_PORT_CONFIG,
+                                                 16, DRV_NAME);
+        if (!galaxy->res_config_port) {
+                dev_err(dev, "could not grab ports %#lx-%#lx\n",
+                        port[n] + GALAXY_PORT_CONFIG,
+                        port[n] + GALAXY_PORT_CONFIG + 15);
+                err = -EBUSY;
+                goto error;
+        }
+        galaxy->config_port = ioport_map(port[n] + GALAXY_PORT_CONFIG, 16);
+
+        galaxy_config(galaxy, config[n]);
+
+        galaxy->res_wss_port = request_region(wss_port[n], 4, DRV_NAME);
+        if (!galaxy->res_wss_port)  {
+                dev_err(dev, "could not grab ports %#lx-%#lx\n", wss_port[n],
+                        wss_port[n] + 3);
+                err = -EBUSY;
+                goto error;
+        }
+        galaxy->wss_port = ioport_map(wss_port[n], 4);
+
+        err = galaxy_wss_config(galaxy, wss_config[n]);
+        if (err < 0) {
+                dev_err(dev, "could not configure WSS\n");
+                goto error;
+        }
+
+        strcpy(card->driver, DRV_NAME);
+        strcpy(card->shortname, DRV_NAME);
+        sprintf(card->longname, "%s at %#lx/%#lx, irq %d, dma %d/%d",
+                card->shortname, port[n], wss_port[n], irq[n], dma1[n],
+                dma2[n]);
+
+        err = snd_wss_create(card, wss_port[n] + 4, -1, irq[n], dma1[n],
+                             dma2[n], WSS_HW_DETECT, 0, &chip);
+        if (err < 0)
+                goto error;
+
+        err = snd_wss_pcm(chip, 0, NULL);
+        if (err < 0)
+                goto error;
+
+        err = snd_wss_mixer(chip);
+        if (err < 0)
+                goto error;
+
+        err = snd_wss_timer(chip, 0, NULL);
+        if (err < 0)
+                goto error;
+
+        if (mpu_port[n] >= 0) {
+                err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
+                                          mpu_port[n], 0, mpu_irq[n],
+                                          IRQF_DISABLED, NULL);
+                if (err < 0)
+                        goto error;
+        }
+
+        if (fm_port[n] >= 0) {
+                struct snd_opl3 *opl3;
+
+                err = snd_opl3_create(card, fm_port[n], fm_port[n] + 2,
+                                      OPL3_HW_AUTO, 0, &opl3);
+                if (err < 0) {
+                        dev_err(dev, "no OPL device at %#lx\n", fm_port[n]);
+                        goto error;
+                }
+                err = snd_opl3_timer_new(opl3, 1, 2);
+                if (err < 0)
+                        goto error;
+
+                err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
+                if (err < 0)
+                        goto error;
+        }
+
+        err = snd_card_register(card);
+        if (err < 0)
+                goto error;
+
+        dev_set_drvdata(dev, card);
+        return 0;
+
+error:
+        snd_card_free(card);
+        return err;
+}
+
+static int __devexit snd_galaxy_remove(struct device *dev, unsigned int n)
+{
+        snd_card_free(dev_get_drvdata(dev));
+        dev_set_drvdata(dev, NULL);
+        return 0;
+}
+
+static struct isa_driver snd_galaxy_driver = {
+        .match          = snd_galaxy_match,
+        .probe          = snd_galaxy_probe,
+        .remove         = __devexit_p(snd_galaxy_remove),
+
+        .driver         = {
+                .name   = DEV_NAME
+        }
+};
+
+static int __init alsa_card_galaxy_init(void)
+{
+        return isa_register_driver(&snd_galaxy_driver, SNDRV_CARDS);
+}
+
+static void __exit alsa_card_galaxy_exit(void)
+{
+        isa_unregister_driver(&snd_galaxy_driver);
+}
+
+module_init(alsa_card_galaxy_init);
+module_exit(alsa_card_galaxy_exit);
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index f26eac8d8110..3e4a58b72913 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -191,7 +191,7 @@ static int __devinit snd_gusmax_mixer(struct snd_wss *chip)
 
 static void snd_gusmax_free(struct snd_card *card)
 {
-        struct snd_gusmax *maxcard = (struct snd_gusmax *)card->private_data;
+        struct snd_gusmax *maxcard = card->private_data;
         
         if (maxcard == NULL)
                 return;
@@ -219,7 +219,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
         if (err < 0)
                 return err;
         card->private_free = snd_gusmax_free;
-        maxcard = (struct snd_gusmax *)card->private_data;
+        maxcard = card->private_data;
         maxcard->card = card;
         maxcard->irq = -1;
         
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 265abcce9dba..9b915e27b5bd 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -264,7 +264,7 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card)
                 snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1);
                 return -ENODEV;
         }
-        /* try if the MIC register is accesible */
+        /* try if the MIC register is accessible */
         tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC);
         snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a);
         if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) {
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index 0c40951b6523..5d61f5a29130 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -370,7 +370,7 @@ init_arrays(struct snd_emu8000 *emu)
 
 /*
  * Size the onboard memory.
- * This is written so as not to need arbitary delays after the write. It
+ * This is written so as not to need arbitrary delays after the write. It
  * seems that the only way to do this is to use the one channel and keep
  * reallocating between read and write.
  */
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index 81284a8fa0ce..2259e3f726a7 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -72,7 +72,7 @@ static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id)
 
 static void snd_sb8_free(struct snd_card *card)
 {
-        struct snd_sb8 *acard = (struct snd_sb8 *)card->private_data;
+        struct snd_sb8 *acard = card->private_data;
 
         if (acard == NULL)
                 return;
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
deleted file mode 100644
index 6fe27b9d9440..000000000000
--- a/sound/isa/sgalaxy.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- *  Driver for Aztech Sound Galaxy cards
- *  Copyright (c) by Christopher Butler <chrisb@sandy.force9.co.uk.
- *
- *  I don't have documentation for this card, I based this driver on the
- *  driver for OSS/Free included in the kernel source (drivers/sound/sgalaxy.c)
- *
- *   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 <linux/init.h>
-#include <linux/err.h>
-#include <linux/isa.h>
-#include <linux/delay.h>
-#include <linux/time.h>
-#include <linux/interrupt.h>
-#include <linux/moduleparam.h>
-#include <asm/dma.h>
-#include <sound/core.h>
-#include <sound/sb.h>
-#include <sound/wss.h>
-#include <sound/control.h>
-#define SNDRV_LEGACY_FIND_FREE_IRQ
-#define SNDRV_LEGACY_FIND_FREE_DMA
-#include <sound/initval.h>
-
-MODULE_AUTHOR("Christopher Butler <chrisb@sandy.force9.co.uk>");
-MODULE_DESCRIPTION("Aztech Sound Galaxy");
-MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Aztech Systems,Sound Galaxy}}");
-
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;  /* Enable this card */
-static long sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;   /* 0x220,0x240 */
-static long wssport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;  /* 0x530,0xe80,0xf40,0x604 */
-static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* 7,9,10,11 */
-static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;       /* 0,1,3 */
-
-module_param_array(index, int, NULL, 0444);
-MODULE_PARM_DESC(index, "Index value for Sound Galaxy soundcard.");
-module_param_array(id, charp, NULL, 0444);
-MODULE_PARM_DESC(id, "ID string for Sound Galaxy soundcard.");
-module_param_array(sbport, long, NULL, 0444);
-MODULE_PARM_DESC(sbport, "Port # for Sound Galaxy SB driver.");
-module_param_array(wssport, long, NULL, 0444);
-MODULE_PARM_DESC(wssport, "Port # for Sound Galaxy WSS driver.");
-module_param_array(irq, int, NULL, 0444);
-MODULE_PARM_DESC(irq, "IRQ # for Sound Galaxy driver.");
-module_param_array(dma1, int, NULL, 0444);
-MODULE_PARM_DESC(dma1, "DMA1 # for Sound Galaxy driver.");
-
-#define SGALAXY_AUXC_LEFT 18
-#define SGALAXY_AUXC_RIGHT 19
-
-#define PFX     "sgalaxy: "
-
-/*
-
- */
-
-#define AD1848P1( port, x ) ( port + c_d_c_AD1848##x )
-
-/* from lowlevel/sb/sb.c - to avoid having to allocate a struct snd_sb for the */
-/* short time we actually need it.. */
-
-static int snd_sgalaxy_sbdsp_reset(unsigned long port)
-{
-        int i;
-
-        outb(1, SBP1(port, RESET));
-        udelay(10);
-        outb(0, SBP1(port, RESET));
-        udelay(30);
-        for (i = 0; i < 1000 && !(inb(SBP1(port, DATA_AVAIL)) & 0x80); i++);
-        if (inb(SBP1(port, READ)) != 0xaa) {
-                snd_printd("sb_reset: failed at 0x%lx!!!\n", port);
-                return -ENODEV;
-        }
-        return 0;
-}
-
-static int __devinit snd_sgalaxy_sbdsp_command(unsigned long port,
-                                               unsigned char val)
-{
-        int i;
-        
-        for (i = 10000; i; i--)
-                if ((inb(SBP1(port, STATUS)) & 0x80) == 0) {
-                        outb(val, SBP1(port, COMMAND));
-                        return 1;
-                }
-
-        return 0;
-}
-
-static irqreturn_t snd_sgalaxy_dummy_interrupt(int irq, void *dev_id)
-{
-        return IRQ_NONE;
-}
-
-static int __devinit snd_sgalaxy_setup_wss(unsigned long port, int irq, int dma)
-{
-        static int interrupt_bits[] = {-1, -1, -1, -1, -1, -1, -1, 0x08, -1, 
-                                       0x10, 0x18, 0x20, -1, -1, -1, -1};
-        static int dma_bits[] = {1, 2, 0, 3};
-        int tmp, tmp1;
-
-        if ((tmp = inb(port + 3)) == 0xff)
-        {
-                snd_printdd("I/O address dead (0x%lx)\n", port);
-                return 0;
-        }
-#if 0
-        snd_printdd("WSS signature = 0x%x\n", tmp);
-#endif
-
-        if ((tmp & 0x3f) != 0x04 &&
-            (tmp & 0x3f) != 0x0f &&
-            (tmp & 0x3f) != 0x00) {
-                snd_printdd("No WSS signature detected on port 0x%lx\n",
-                            port + 3);
-                return 0;
-        }
-
-#if 0
-        snd_printdd(PFX "setting up IRQ/DMA for WSS\n");
-#endif
-
-        /* initialize IRQ for WSS codec */
-        tmp = interrupt_bits[irq % 16];
-        if (tmp < 0)
-                return -EINVAL;
-
-        if (request_irq(irq, snd_sgalaxy_dummy_interrupt, IRQF_DISABLED, "sgalaxy", NULL)) {
-                snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq);
-                return -EIO;
-        }
-
-        outb(tmp | 0x40, port);
-        tmp1 = dma_bits[dma % 4];
-        outb(tmp | tmp1, port);
-
-        free_irq(irq, NULL);
-
-        return 0;
-}
-
-static int __devinit snd_sgalaxy_detect(int dev, int irq, int dma)
-{
-#if 0
-        snd_printdd(PFX "switching to WSS mode\n");
-#endif
-
-        /* switch to WSS mode */
-        snd_sgalaxy_sbdsp_reset(sbport[dev]);
-
-        snd_sgalaxy_sbdsp_command(sbport[dev], 9);
-        snd_sgalaxy_sbdsp_command(sbport[dev], 0);
-
-        udelay(400);
-        return snd_sgalaxy_setup_wss(wssport[dev], irq, dma);
-}
-
-static struct snd_kcontrol_new snd_sgalaxy_controls[] = {
-WSS_DOUBLE("Aux Playback Switch", 0,
-                SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 7, 7, 1, 1),
-WSS_DOUBLE("Aux Playback Volume", 0,
-                SGALAXY_AUXC_LEFT, SGALAXY_AUXC_RIGHT, 0, 0, 31, 0)
-};
-
-static int __devinit snd_sgalaxy_mixer(struct snd_wss *chip)
-{
-        struct snd_card *card = chip->card;
-        struct snd_ctl_elem_id id1, id2;
-        unsigned int idx;
-        int err;
-
-        memset(&id1, 0, sizeof(id1));
-        memset(&id2, 0, sizeof(id2));
-        id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        /* reassign AUX0 to LINE */
-        strcpy(id1.name, "Aux Playback Switch");
-        strcpy(id2.name, "Line Playback Switch");
-        if ((err = snd_ctl_rename_id(card, &id1, &id2)) < 0)
-                return err;
-        strcpy(id1.name, "Aux Playback Volume");
-        strcpy(id2.name, "Line Playback Volume");
-        if ((err = snd_ctl_rename_id(card, &id1, &id2)) < 0)
-                return err;
-        /* reassign AUX1 to FM */
-        strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;
-        strcpy(id2.name, "FM Playback Switch");
-        if ((err = snd_ctl_rename_id(card, &id1, &id2)) < 0)
-                return err;
-        strcpy(id1.name, "Aux Playback Volume");
-        strcpy(id2.name, "FM Playback Volume");
-        if ((err = snd_ctl_rename_id(card, &id1, &id2)) < 0)
-                return err;
-        /* build AUX2 input */
-        for (idx = 0; idx < ARRAY_SIZE(snd_sgalaxy_controls); idx++) {
-                err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_sgalaxy_controls[idx], chip));
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-
-static int __devinit snd_sgalaxy_match(struct device *devptr, unsigned int dev)
-{
-        if (!enable[dev])
-                return 0;
-        if (sbport[dev] == SNDRV_AUTO_PORT) {
-                snd_printk(KERN_ERR PFX "specify SB port\n");
-                return 0;
-        }
-        if (wssport[dev] == SNDRV_AUTO_PORT) {
-                snd_printk(KERN_ERR PFX "specify WSS port\n");
-                return 0;
-        }
-        return 1;
-}
-
-static int __devinit snd_sgalaxy_probe(struct device *devptr, unsigned int dev)
-{
-        static int possible_irqs[] = {7, 9, 10, 11, -1};
-        static int possible_dmas[] = {1, 3, 0, -1};
-        int err, xirq, xdma1;
-        struct snd_card *card;
-        struct snd_wss *chip;
-
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (err < 0)
-                return err;
-
-        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 DMA\n");
-                        err = -EBUSY;
-                        goto _err;
-                }
-        }
-
-        if ((err = snd_sgalaxy_detect(dev, xirq, xdma1)) < 0)
-                goto _err;
-
-        err = snd_wss_create(card, wssport[dev] + 4, -1,
-                             xirq, xdma1, -1,
-                             WSS_HW_DETECT, 0, &chip);
-        if (err < 0)
-                goto _err;
-        card->private_data = chip;
-
-        err = snd_wss_pcm(chip, 0, NULL);
-        if (err < 0) {
-                snd_printdd(PFX "error creating new WSS PCM device\n");
-                goto _err;
-        }
-        err = snd_wss_mixer(chip);
-        if (err < 0) {
-                snd_printdd(PFX "error creating new WSS mixer\n");
-                goto _err;
-        }
-        if ((err = snd_sgalaxy_mixer(chip)) < 0) {
-                snd_printdd(PFX "the mixer rewrite failed\n");
-                goto _err;
-        }
-
-        strcpy(card->driver, "Sound Galaxy");
-        strcpy(card->shortname, "Sound Galaxy");
-        sprintf(card->longname, "Sound Galaxy at 0x%lx, irq %d, dma %d",
-                wssport[dev], xirq, xdma1);
-
-        snd_card_set_dev(card, devptr);
-
-        if ((err = snd_card_register(card)) < 0)
-                goto _err;
-
-        dev_set_drvdata(devptr, card);
-        return 0;
-
- _err:
-        snd_card_free(card);
-        return err;
-}
-
-static int __devexit snd_sgalaxy_remove(struct device *devptr, unsigned int dev)
-{
-        snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int snd_sgalaxy_suspend(struct device *pdev, unsigned int n,
-                               pm_message_t state)
-{
-        struct snd_card *card = dev_get_drvdata(pdev);
-        struct snd_wss *chip = card->private_data;
-
-        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        chip->suspend(chip);
-        return 0;
-}
-
-static int snd_sgalaxy_resume(struct device *pdev, unsigned int n)
-{
-        struct snd_card *card = dev_get_drvdata(pdev);
-        struct snd_wss *chip = card->private_data;
-
-        chip->resume(chip);
-        snd_wss_out(chip, SGALAXY_AUXC_LEFT, chip->image[SGALAXY_AUXC_LEFT]);
-        snd_wss_out(chip, SGALAXY_AUXC_RIGHT, chip->image[SGALAXY_AUXC_RIGHT]);
-
-        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
-        return 0;
-}
-#endif
-
-#define DEV_NAME "sgalaxy"
-
-static struct isa_driver snd_sgalaxy_driver = {
-        .match          = snd_sgalaxy_match,
-        .probe          = snd_sgalaxy_probe,
-        .remove         = __devexit_p(snd_sgalaxy_remove),
-#ifdef CONFIG_PM
-        .suspend        = snd_sgalaxy_suspend,
-        .resume         = snd_sgalaxy_resume,
-#endif
-        .driver         = {
-                .name   = DEV_NAME
-        },
-};
-
-static int __init alsa_card_sgalaxy_init(void)
-{
-        return isa_register_driver(&snd_sgalaxy_driver, SNDRV_CARDS);
-}
-
-static void __exit alsa_card_sgalaxy_exit(void)
-{
-        isa_unregister_driver(&snd_sgalaxy_driver);
-}
-
-module_init(alsa_card_sgalaxy_init)
-module_exit(alsa_card_sgalaxy_exit)
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c
index f14a7c0b6998..65329f3abc30 100644
--- a/sound/isa/wavefront/wavefront_midi.c
+++ b/sound/isa/wavefront/wavefront_midi.c
@@ -537,7 +537,7 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)
         }
 
         /* Turn on Virtual MIDI, but first *always* turn it off,
-           since otherwise consectutive reloads of the driver will
+           since otherwise consecutive reloads of the driver will
            never cause the hardware to generate the initial "internal" or 
            "external" source bytes in the MIDI data stream. This
            is pretty important, since the internal hardware generally will
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 9191b32d9130..2a42cc377957 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -424,7 +424,7 @@ void snd_wss_mce_down(struct snd_wss *chip)
 
         /*
          * Wait for (possible -- during init auto-calibration may not be set)
-         * calibration process to start. Needs upto 5 sample periods on AD1848
+         * calibration process to start. Needs up to 5 sample periods on AD1848
          * which at the slowest possible rate of 5.5125 kHz means 907 us.
          */
         msleep(1);