ALSA CVS update - Takashi Iwai <tiwai@suse.de>

Documentation,Intel8x0 driver,VIA82xx driver
- added more descriptions for ac97_quirk module option.

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 2472f42ed50d1350a71498cd642e0e15aaec3850..09c8530770dae4709ed3435808676658fcf0ba4a 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -601,8 +601,15 @@ Module parameters
     ac97_clock   - AC'97 codec clock base (0 = auto-detect)
     joystick      - Enable joystick (default off)
     mpu_port      - MPU401 port # (0 = disabled, 0x330,0x300)
+    ac97_quirk    - AC'97 workaround for strange hardware (-1 = default)
+                    -1 = default, don't override
+                     0 = disable
+                     1 = use headphone control as master
+                     2 = swap headphone and master controls
+                     3 = for AD1985, turn on OMS bit and use headphone
 
     Module supports autoprobe and multiple bus-master chips (max 8).
+
     Note: the latest driver supports auto-detection of chip clock.
     if you still encounter too fast playback, specify the clock
     explicitly via the module option "ac97_clock=41194".
@@ -610,6 +617,13 @@ Module parameters
     The joystick and MPU-401 are supported only certain hardwares.
     MPU401 is experimental,  It doesn't work perfectly.
 
+    The ac97_quirk option is used to enable/override the workaround
+    for specific devices.  Some hardware have swapped output pins
+    between Master and Headphone, or Surround.  The driver provides
+    the auto-detection of known problematic devices, but some might
+    be unknown or wrongly detected.  In such a case, pass the proper
+    value with this option.
+
     The power-management is supported.
     
   Module snd-interwave
@@ -668,6 +682,7 @@ Module parameters
                        others) 
 
     Module supports autoprobe and multiple chips (max 8).
+
     Note: the binding of amplifier is dependent on hardware.
     If there is no sound even though all channels are unmuted, try to
     specify other gpio connection via amp_gpio option. 
@@ -711,6 +726,7 @@ Module parameters
     vaio_hack        - alias buffer_top=0x25a800
 
     Module supports autoprobe and multiple chips (max 8).
+
     Note: on some notebooks the buffer address cannot be detected
     automatically, or causes hang-up during initialization.
     In such a case, specify the buffer top address explicity via
@@ -797,6 +813,7 @@ Module parameters
     enable_beep     - enable beep using PCM (enabled as default)
 
     Module supports autoprobe a chip.
+
     Note: the driver may have problems regarding endianess.
 
     The power-management is supported.
@@ -1015,6 +1032,8 @@ Module parameters
                  0 = auto (defalut), 1 = enable, 2 = disable,
                  3 = 48k only, 4 = no VRA
                  [VIA8233/C,8235 only]
+    ac97_quirk  - AC'97 workaround for strange hardware
+                  See the description of intel8x0 module for details.
 
     Module supports autoprobe and multiple bus-master chips (max 8).
 

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 0f4fe2670fddf7d5c124a34c78c6199d46d0e500..e6e8ffcb7f638402e6f4bdbe5bdd9e838c0013fb 100644 (file)
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -94,7 +94,7 @@ MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = auto-detect).");
 MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ",default:0");
 MODULE_PARM(ac97_quirk, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
-MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED ",default:-1");
+MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED ",allows:{{-1,3}},dialog:list,default:-1");
 #ifdef SUPPORT_JOYSTICK
 MODULE_PARM(joystick, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(joystick, "Enable joystick for Intel i8x0 soundcard.");

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 94cbb01251c4101b927065b6922408410f43d2fe..656c8d0e3af899a852713c4a6a51ce9b401daea9 100644 (file)
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -107,7 +107,7 @@ MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
 MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ",default:48000");
 MODULE_PARM(ac97_quirk, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
-MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED ",default:-1");
+MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED ",allows:{{-1,3}},dialog:list,default:-1");
 MODULE_PARM(dxs_support, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA)");
 MODULE_PARM_SYNTAX(dxs_support, SNDRV_ENABLED ",allows:{{0,4}},dialog:list");