Add patches accepted for 2.6.22-rc4
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.22-rc1 / 0006-ACPI-ibm-acpi-update-documentation.patch
blobb0b06db11adb33dde0c092050906115220fe653b
1 From 38f996ed21089fa4ae40526a5f428e3c792ea561 Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Fri, 23 Mar 2007 17:33:59 -0300
4 Subject: ACPI: ibm-acpi: update documentation
6 Update documentation header, and relocate a hunk of text that was missplaced.
8 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
9 Signed-off-by: Len Brown <len.brown@intel.com>
10 ---
11 Documentation/ibm-acpi.txt | 85 +++++++++++++-------------------------------
12 1 files changed, 25 insertions(+), 60 deletions(-)
14 diff --git a/Documentation/ibm-acpi.txt b/Documentation/ibm-acpi.txt
15 index cdcef01..f409f4b 100644
16 --- a/Documentation/ibm-acpi.txt
17 +++ b/Documentation/ibm-acpi.txt
18 @@ -1,16 +1,17 @@
19 IBM ThinkPad ACPI Extras Driver
21 - Version 0.12
22 - 17 August 2005
23 + Version 0.13
24 + 31 December 2006
26 Borislav Deianov <borislav@users.sf.net>
27 + Henrique de Moraes Holschuh <hmh@hmh.eng.br>
28 http://ibm-acpi.sf.net/
31 This is a Linux ACPI driver for the IBM ThinkPad laptops. It supports
32 various features of these laptops which are accessible through the
33 -ACPI framework but not otherwise supported by the generic Linux ACPI
34 -drivers.
35 +ACPI framework but not otherwise fully supported by the generic Linux
36 +ACPI drivers.
39 Status
40 @@ -638,6 +639,26 @@ The ThinkPad's ACPI DSDT code will reprogram the fan on its own when
41 certain conditions are met. It will override any fan programming done
42 through ibm-acpi.
44 +The ibm-acpi kernel driver can be programmed to revert the fan level
45 +to a safe setting if userspace does not issue one of the fan commands:
46 +"enable", "disable", "level" or "watchdog" within a configurable
47 +ammount of time. To do this, use the "watchdog" command.
49 + echo 'watchdog <interval>' > /proc/acpi/ibm/fan
51 +Interval is the ammount of time in seconds to wait for one of the
52 +above mentioned fan commands before reseting the fan level to a safe
53 +one. If set to zero, the watchdog is disabled (default). When the
54 +watchdog timer runs out, it does the exact equivalent of the "enable"
55 +fan command.
57 +Note that the watchdog timer stops after it enables the fan. It will
58 +be rearmed again automatically (using the same interval) when one of
59 +the above mentioned fan commands is received. The fan watchdog is,
60 +therefore, not suitable to protect against fan mode changes made
61 +through means other than the "enable", "disable", and "level" fan
62 +commands.
64 EXPERIMENTAL: WAN -- /proc/acpi/ibm/wan
65 ---------------------------------------
67 @@ -670,59 +691,3 @@ example:
69 modprobe ibm_acpi hotkey=enable,0xffff video=auto_disable
71 -The ibm-acpi kernel driver can be programmed to revert the fan level
72 -to a safe setting if userspace does not issue one of the fan commands:
73 -"enable", "disable", "level" or "watchdog" within a configurable
74 -ammount of time. To do this, use the "watchdog" command.
76 - echo 'watchdog <interval>' > /proc/acpi/ibm/fan
78 -Interval is the ammount of time in seconds to wait for one of the
79 -above mentioned fan commands before reseting the fan level to a safe
80 -one. If set to zero, the watchdog is disabled (default). When the
81 -watchdog timer runs out, it does the exact equivalent of the "enable"
82 -fan command.
84 -Note that the watchdog timer stops after it enables the fan. It will
85 -be rearmed again automatically (using the same interval) when one of
86 -the above mentioned fan commands is received. The fan watchdog is,
87 -therefore, not suitable to protect against fan mode changes made
88 -through means other than the "enable", "disable", and "level" fan
89 -commands.
92 -Example Configuration
93 ----------------------
95 -The ACPI support in the kernel is intended to be used in conjunction
96 -with a user-space daemon, acpid. The configuration files for this
97 -daemon control what actions are taken in response to various ACPI
98 -events. An example set of configuration files are included in the
99 -config/ directory of the tarball package available on the web
100 -site. Note that these are provided for illustration purposes only and
101 -may need to be adapted to your particular setup.
103 -The following utility scripts are used by the example action
104 -scripts (included with ibm-acpi for completeness):
106 - /usr/local/sbin/idectl -- from the hdparm source distribution,
107 - see http://www.ibiblio.org/pub/Linux/system/hardware
108 - /usr/local/sbin/laptop_mode -- from the Linux kernel source
109 - distribution, see Documentation/laptop-mode.txt
110 - /sbin/service -- comes with Redhat/Fedora distributions
111 - /usr/sbin/hibernate -- from the Software Suspend 2 distribution,
112 - see http://softwaresuspend.berlios.de/
114 -Toan T Nguyen <ntt@physics.ucla.edu> notes that Suse uses the
115 -powersave program to suspend ('powersave --suspend-to-ram') or
116 -hibernate ('powersave --suspend-to-disk'). This means that the
117 -hibernate script is not needed on that distribution.
119 -Henrik Brix Andersen <brix@gentoo.org> has written a Gentoo ACPI event
120 -handler script for the X31. You can get the latest version from
121 -http://dev.gentoo.org/~brix/files/x31.sh
123 -David Schweikert <dws@ee.eth.ch> has written an alternative blank.sh
124 -script which works on Debian systems. This scripts has now been
125 -extended to also work on Fedora systems and included as the default
126 -blank.sh in the distribution.
128 1.5.1