Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[~andy/linux] / Documentation / sound / alsa / CMIPCI.txt

diff --git a/Documentation/sound/alsa/CMIPCI.txt b/Documentation/sound/alsa/CMIPCI.txt
index 4a7df771b806c7f7728d4b72292b62478a3bcd37..16935c8561f7b5d037192e66606607c9dedcaa1e 100644 (file)
--- a/Documentation/sound/alsa/CMIPCI.txt
+++ b/Documentation/sound/alsa/CMIPCI.txt
@@ -1,5 +1,5 @@
-              Brief Notes on C-Media 8738/8338 Driver
-              =======================================
+         Brief Notes on C-Media 8338/8738/8768/8770 Driver
+         =================================================

 
                    Takashi Iwai <tiwai@suse.de>
 
 
                    Takashi Iwai <tiwai@suse.de>
 


@@ -16,11 +16,11 @@ As default, ALSA driver assigns the first PCM device (i.e. hw:0,0 for
 card#0) for front and 4/6ch playbacks, while the second PCM device
 (hw:0,1) is assigned to the second DAC for rear playback.
 
 card#0) for front and 4/6ch playbacks, while the second PCM device
 (hw:0,1) is assigned to the second DAC for rear playback.
 

-There are slight difference between two DACs.
+There are slight differences between the two DACs:

 
 - The first DAC supports U8 and S16LE formats, while the second DAC
   supports only S16LE.
 
 - The first DAC supports U8 and S16LE formats, while the second DAC
   supports only S16LE.

-- The seconde DAC supports only two channel stereo.
+- The second DAC supports only two channel stereo.

 
 Please note that the CM8x38 DAC doesn't support continuous playback
 rate but only fixed rates: 5512, 8000, 11025, 16000, 22050, 32000,
 
 Please note that the CM8x38 DAC doesn't support continuous playback
 rate but only fixed rates: 5512, 8000, 11025, 16000, 22050, 32000,


@@ -76,7 +76,7 @@ in alsa-lib.  For example, you can play a WAV file with 6 channels like
 
        % aplay -Dsurround51 sixchannels.wav
 
 
        % aplay -Dsurround51 sixchannels.wav
 

-For programmin the 4/6 channel playback, you need to specify the PCM
+For programming the 4/6 channel playback, you need to specify the PCM

 channels as you like and set the format S16LE.  For example, for playback
 with 4 channels,
 
 channels as you like and set the format S16LE.  For example, for playback
 with 4 channels,
 


@@ -89,19 +89,22 @@ and use the interleaved 4 channel data.
 
 There are some control switchs affecting to the speaker connections:
 
 
 There are some control switchs affecting to the speaker connections:
 

-"Line-In As Rear"      - As mentioned above, the line-in jack is used
-       for the rear (3th and 4th channels) output.
-"Line-In As Bass"      - The line-in jack is used for the bass (5th
-       and 6th channels) output.
-"Mic As Center/LFE"    - The mic jack is used for the bass output.
-       If this switch is on, you cannot use a microphone as a capture
-       source, of course.
-
+"Line-In Mode" - an enum control to change the behavior of line-in
+       jack.  Either "Line-In", "Rear Output" or "Bass Output" can
+       be selected.  The last item is available only with model 039
+       or newer. 
+       When "Rear Output" is chosen, the surround channels 3 and 4
+       are output to line-in jack.
+"Mic-In Mode"  - an enum control to change the behavior of mic-in
+       jack.  Either "Mic-In" or "Center/LFE Output" can be
+       selected. 
+       When "Center/LFE Output" is chosen, the center and bass
+       channels (channels 5 and 6) are output to mic-in jack. 

 
 Digital I/O
 -----------
 
 
 Digital I/O
 -----------
 

-The CM8x38 provides the excellent SPDIF capability with very chip
+The CM8x38 provides the excellent SPDIF capability with very cheap

 price (yes, that's the reason I bought the card :)
 
 The SPDIF playback and capture are done via the third PCM device
 price (yes, that's the reason I bought the card :)
 
 The SPDIF playback and capture are done via the third PCM device


@@ -122,8 +125,9 @@ respectively, so you cannot playback both analog and digital streams
 simultaneously.
 
 To enable SPDIF output, you need to turn on "IEC958 Output Switch"
 simultaneously.
 
 To enable SPDIF output, you need to turn on "IEC958 Output Switch"

-control via mixer or alsactl.  Then you'll see the red light on from
-the card so you know that's working obviously :)
+control via mixer or alsactl ("IEC958" is the official name of
+so-called S/PDIF).  Then you'll see the red light on from the card so
+you know that's working obviously :)

 The SPDIF input is always enabled, so you can hear SPDIF input data
 from line-out with "IEC958 In Monitor" switch at any time (see
 below).
 The SPDIF input is always enabled, so you can hear SPDIF input data
 from line-out with "IEC958 In Monitor" switch at any time (see
 below).


@@ -205,9 +209,13 @@ In addition to the standard SB mixer, CM8x38 provides more functions.
 MIDI CONTROLLER
 ---------------
 
 MIDI CONTROLLER
 ---------------
 

-The MPU401-UART interface is enabled as default only for the first
-(CMIPCI) card.  You need to set module option "midi_port" properly
-for the 2nd (CMIPCI) card.
+With CMI8338 chips, the MPU401-UART interface is disabled as default.
+You need to set the module option "mpu_port" to a valid I/O port address
+to enable MIDI support.  Valid I/O ports are 0x300, 0x310, 0x320 and
+0x330.  Choose a value that doesn't conflict with other cards.
+
+With CMI8738 and newer chips, the MIDI interface is enabled by default
+and the driver automatically chooses a port address.

 
 There is _no_ hardware wavetable function on this chip (except for
 OPL3 synth below).
 
 There is _no_ hardware wavetable function on this chip (except for
 OPL3 synth below).


@@ -225,13 +233,17 @@ Set "fm_port" module option for more cards.
 The output quality of FM OPL/3 is, however, very weird.
 I don't know why..
 
 The output quality of FM OPL/3 is, however, very weird.
 I don't know why..
 

+CMI8768 and newer chips do not have the FM synth.
+

 
 Joystick and Modem
 ------------------
 
 
 Joystick and Modem
 ------------------
 

-The joystick and modem should be available by enabling the control
-switch "Joystick" and "Modem" respectively.  But I myself have never
-tested them yet.
+The legacy joystick is supported.  To enable the joystick support, pass
+joystick_port=1 module option.  The value 1 means the auto-detection.
+If the auto-detection fails, try to pass the exact I/O address.
+
+The modem is enabled dynamically via a card control switch "Modem".

 
 
 Debugging Information
 
 
 Debugging Information