diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2009-12-15 21:51:11 -0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 23:57:44 -0500 |
| commit | 0d204c34e85d1d63e5fdd3e3192747daf0ee7ec1 (patch) | |
| tree | cdf93247a1e8cb673f0a3fcae5c193e1d55d3fc3 /Documentation/laptops/thinkpad-acpi.txt | |
| parent | c7ac6291ea7ebc568a1fce16fed87d102898f264 (diff) | |
| download | linux-3.10-0d204c34e85d1d63e5fdd3e3192747daf0ee7ec1.tar.gz linux-3.10-0d204c34e85d1d63e5fdd3e3192747daf0ee7ec1.tar.bz2 linux-3.10-0d204c34e85d1d63e5fdd3e3192747daf0ee7ec1.zip | |
thinkpad-acpi: basic ALSA mixer support (v2)
Add the basic ALSA mixer functionality. The mixer is event-driven,
and will work fine on IBM ThinkPads. I expect Lenovo ThinkPads will
cause some trouble with the event interface.
Heavily based on work by Lorne Applebaum <lorne.applebaum@gmail.com>
and ideas from Matthew Garrett <mjg@redhat.com>.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Lorne Applebaum <lorne.applebaum@gmail.com>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/laptops/thinkpad-acpi.txt')
| -rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 6a5814330e5..b4ed30cb137 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt @@ -1096,6 +1096,7 @@ Volume control -------------- procfs: /proc/acpi/ibm/volume +ALSA: "ThinkPad Console Audio Control", default ID: "ThinkPadEC" NOTE: by default, the volume control interface operates in read-only mode, as it is supposed to be used for on-screen-display purposes. @@ -1144,9 +1145,8 @@ The driver will operate in volume_mode=3 by default. If that does not work well on your ThinkPad model, please report this to ibm-acpi-devel@lists.sourceforge.net. -The ALSA mixer interface to this feature is still missing, but patches -to add it exist. That problem should be addressed in the not so -distant future. +The driver supports the standard ALSA module parameters. If the ALSA +mixer is disabled, the driver will disable all volume functionality. Fan control and monitoring: fan speed, fan enable/disable @@ -1478,3 +1478,4 @@ Sysfs interface changelog: 0x020700: Support for mute-only mixers. Volume control in read-only mode by default. + Marker for ALSA mixer support. |