Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't

have a MIPS box at hand.

2 files changed, 65 insertions, 21 deletions

diff --git a/Documentation/sound/CMI8330 b/Documentation/sound/CMI8330
index 43b1c5a72..fca15f606 100644
--- a/Documentation/sound/CMI8330
+++ b/Documentation/sound/CMI8330
@@ -1,46 +1,48 @@
-How to enable CMI 8330 soundchip on Linux
+How to enable CMI 8330 (SOUNDPRO) soundchip on Linux
 ------------------------------------------
 Stefan Laudat <Stefan.Laudat@asit.ro>
 
-Hello folks, 
-	
-	The CMI8330 soundchip is a very small chip found on many recent 
-	motherboards. In order to use it you just have to use a proper 
-        isapnp.conf and a little bit of patience. 
+[Note: The CMI 8338 is unrelated and right now unsupported]
+
 	
-	Of course you will have to compile kernel sound support as module, 
-        as shown below:
+	In order to use CMI8330 under Linux  you just have to use a proper isapnp.conf, a good isapnp and a little bit of patience.  I use isapnp 1.17, but
+you may get a better one I guess at http://www.roestock.demon.co.uk/isapnptools/.
+
+	Of course you will have to compile kernel sound support as module, as shown below:
 
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS=m
 CONFIG_SOUND_SB=m
 CONFIG_SOUND_ADLIB=m
 CONFIG_SOUND_MPU401=m
-# Just for fun :)
+# Mikro$chaft sound system (kinda useful here ;))	
 CONFIG_SOUND_MSS=m
 
 	The /etc/isapnp.conf file will be:
 
 <snip below>
 
+
 (READPORT 0x0203)
 (ISOLATE PRESERVE)
 (IDENTIFY *)
 (VERBOSITY 2)
 (CONFLICT (IO FATAL)(IRQ FATAL)(DMA FATAL)(MEM FATAL)) # or WARNING
 (VERIFYLD N)
+
+
 # WSS 
 
 (CONFIGURE CMI0001/16777472 (LD 0
 (IO 0 (SIZE 8) (BASE 0x0530))
 (IO 1 (SIZE 8) (BASE 0x0388))
-(INT 0 (IRQ 5 (MODE +E)))
+(INT 0 (IRQ 7 (MODE +E)))
 (DMA 0 (CHANNEL 0))
 (NAME "CMI0001/16777472[0]{CMI8330/C3D Audio Adapter}")
 (ACT Y)
 ))
 
-# Control device ? 
+# MPU
 
 (CONFIGURE CMI0001/16777472 (LD 1
 (IO 0 (SIZE 2) (BASE 0x0330))
@@ -57,10 +59,11 @@ CONFIG_SOUND_MSS=m
 (ACT Y)
 ))
 
-#  SB... 
+# SoundBlaster 
+ 
 (CONFIGURE CMI0001/16777472 (LD 3
 (IO 0 (SIZE 16) (BASE 0x0220))
-(INT 0 (IRQ 7 (MODE +E)))
+(INT 0 (IRQ 5 (MODE +E)))
 (DMA 0 (CHANNEL 1))
 (DMA 1 (CHANNEL 5))
 (NAME "CMI0001/16777472[3]{CMI8330/C3D Audio Adapter}")
@@ -74,13 +77,22 @@ CONFIG_SOUND_MSS=m
 
 	The module sequence is trivial:
 
-/sbin/modprobe sound
-# You need to load the ad1848 module first. That matters, otherwise the 
-# chip falls into soundblaster compatibility and you won't get it back out
-/sbin/insmod ad1848 io=0x530 dma=0 irq=5 soundpro=1
+/sbin/insmod soundcore
+/sbin/insmod sound
 /sbin/insmod uart401
-/sbin/insmod sb io=0x220 irq=5 dma=1 dma16=-1
-/sbin/insmod mpu401 io=0x330
-/sbin/insmod opl3 io=0x388
+# insert this first
+/sbin/insmod ad1848 io=0x530 irq=7 dma=0 soundpro=1
+# The sb module is an alternative to the ad1848 (Microsoft Sound System)
+# Anyhow, this is full duplex and has MIDI
+/sbin/insmod sb io=0x220 dma=1 dma16=5 irq=5 mpu_io=0x330
+
+
 
-	The soundchip is now fully initialized. Enjoy it.
+Alma Chao <elysian@ethereal.torsion.org> suggests the following /etc/conf.modules:
+
+alias sound ad1848
+alias synth0 opl3
+options ad1848 io=0x530 irq=7 dma=0 soundpro=1
+options opl3 io=0x388
+
+	
diff --git a/Documentation/sound/CMI8338 b/Documentation/sound/CMI8338
new file mode 100644
index 000000000..85dfd1c91
--- /dev/null
+++ b/Documentation/sound/CMI8338
@@ -0,0 +1,32 @@
+Audio driver for CM8338/CM8738 chips by Chen-Li Tien
+
+   Be aware: C-Media Electronics Inc. is basically an IC design house,
+   and whose development of software drivers is mainly for use by its OEM
+   customers in their products. C-Media Electronics Inc. itself does not
+   manufacture end-user products, such as PC or sound cards, so it can
+   not fully control the drivers provided to consumers. Drivers provided
+   at this site, therefore, MAY NOT BE APPLICABLE to all sound cards.
+   Drivers you download from this site may function well at certain
+   situation, but C-Media Electronics Inc. does not give any guarantee or
+   assurances. Please be aware that these drivers might cause some
+   technical difficulties when installed
+
+
+1. Config cm8338 driver by 'make menuconfig' or 'make config' command.
+
+2. Please select Sound Card (CONFIG_SOUND=m) support and CMPCI driver (CONFIG_SOUND_CMPCI=m) as modules. Resident mode not tested.
+
+3. Compile the kernel if necessary.
+
+4. Compile the modules by 'make modules'.
+
+5. Install the modules by 'make modules_install'
+
+6. Before first time to run the driver, create module dependency by 'depmod -a'
+
+7. To install the driver, enter 'modprobe cmpci'.
+
+
+Bugs:
+
+1. Real player cannot be run (the same as es1371).