From 6b1a73b8f756b42fd2687205e95c31d2fd9d28df Mon Sep 17 00:00:00 2001
From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Wed, 23 Dec 2009 18:02:41 +0100
Subject: [PATCH] --- yaml --- r: 182689 b: refs/heads/master c:
 44eba3e82b35ae796826a65d8040001582adc10a h: refs/heads/master i:   182687:
 291dcb8b70f53e88e5e8e4c316c89a79e644366d v: v3

---
 [refs]                                        |  2 +-
 .../sound/alsa/ALSA-Configuration.txt         | 15 +++++++++++++
 trunk/sound/isa/sb/jazz16.c                   | 21 ++++++++++++++++++-
 trunk/sound/isa/sb/sb8_main.c                 |  3 ++-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 93ea515de1eb..c9d116cce5f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52e04ea89da57274f0313d2bd73ba02f686cfdeb
+refs/heads/master: 44eba3e82b35ae796826a65d8040001582adc10a
diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
index 7a0a4a9dc18d..c540637eb16a 100644
--- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1123,6 +1123,21 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports multiple cards, autoprobe and ISA PnP.
 
+  Module snd-jazz16
+  -------------------
+
+    Module for Media Vision Jazz16 chipset. The chipset consists of 3 chips:
+    MVD1216 + MVA416 + MVA514.
+
+    port	- port # for SB DSP chip (0x210,0x220,0x230,0x240,0x250,0x260)
+    irq		- IRQ # for SB DSP chip (3,5,7,9,10,15)
+    dma8	- DMA # for SB DSP chip (1,3)
+    dma16	- DMA # for SB DSP chip (5,7)
+    mpu_port	- MPU-401 port # (0x300,0x310,0x320,0x330)
+    mpu_irq	- MPU-401 irq # (2,3,5,7)
+
+    This module supports multiple cards.
+
   Module snd-korg1212
   -------------------
 
diff --git a/trunk/sound/isa/sb/jazz16.c b/trunk/sound/isa/sb/jazz16.c
index d52966b75846..8d21a3feda3a 100644
--- a/trunk/sound/isa/sb/jazz16.c
+++ b/trunk/sound/isa/sb/jazz16.c
@@ -189,10 +189,29 @@ static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev)
 	if (port[dev] == SNDRV_AUTO_PORT) {
 		snd_printk(KERN_ERR "please specify port\n");
 		return 0;
+	} else if (port[dev] == 0x200 || (port[dev] & ~0x270)) {
+		snd_printk(KERN_ERR "incorrect port specified\n");
+		return 0;
+	}
+	if (dma8[dev] != SNDRV_AUTO_DMA &&
+	    dma8[dev] != 1 && dma8[dev] != 3) {
+		snd_printk(KERN_ERR "dma8 must be 1 or 3\n");
+		return 0;
 	}
 	if (dma16[dev] != SNDRV_AUTO_DMA &&
 	    dma16[dev] != 5 && dma16[dev] != 7) {
-		snd_printk(KERN_ERR "dma16 must be 5 or 7");
+		snd_printk(KERN_ERR "dma16 must be 5 or 7\n");
+		return 0;
+	}
+	if (mpu_port[dev] != SNDRV_AUTO_PORT &&
+	    (mpu_port[dev] & ~0x030) != 0x300) {
+		snd_printk(KERN_ERR "incorrect mpu_port specified\n");
+		return 0;
+	}
+	if (mpu_irq[dev] != SNDRV_AUTO_DMA &&
+	    mpu_irq[dev] != 2 && mpu_irq[dev] != 3 &&
+	    mpu_irq[dev] != 5 && mpu_irq[dev] != 7) {
+		snd_printk(KERN_ERR "mpu_irq must be 2, 3, 5 or 7\n");
 		return 0;
 	}
 	return 1;
diff --git a/trunk/sound/isa/sb/sb8_main.c b/trunk/sound/isa/sb/sb8_main.c
index 3222aed5fac6..7d84c9f34dc9 100644
--- a/trunk/sound/isa/sb/sb8_main.c
+++ b/trunk/sound/isa/sb/sb8_main.c
@@ -510,7 +510,8 @@ static int snd_sb8_open(struct snd_pcm_substream *substream)
 	}
 	switch (chip->hardware) {
 	case SB_HW_JAZZ16:
-		runtime->hw.formats |= SNDRV_PCM_FMTBIT_S16_LE;
+		if (chip->dma16 == 5 || chip->dma16 == 7)
+			runtime->hw.formats |= SNDRV_PCM_FMTBIT_S16_LE;
 		runtime->hw.rates |= SNDRV_PCM_RATE_8000_48000;
 		runtime->hw.rate_min = 4000;
 		runtime->hw.rate_max = 50000;