diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2007-07-18 22:45:32 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-07-21 23:38:16 -0400 |
commit | 94b08713186cc47a5c367a866cc0a0a762721455 (patch) | |
tree | a4a8a464a382437bb803aabc2e99a2ca04fa50e6 | |
parent | 74941a69afcc06722685d492784414ec042ab492 (diff) |
ACPI: thinkpad-acpi: checkpoint sysfs interface version due to hotkey
The change in the size of the hotkey mask, the hability to report the keys
that use the higher bits, and the addition of the hotkey_radio_sw attribute
are important enough features to warrant increasing the minor field of the
sysfs interface version.
Also, document a bit better how and when the thinkpad-acpi sysfs interface
version will be updated.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | Documentation/thinkpad-acpi.txt | 17 | ||||
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt index fe26e50a2b15..7a06a27ee37b 100644 --- a/Documentation/thinkpad-acpi.txt +++ b/Documentation/thinkpad-acpi.txt | |||
@@ -134,6 +134,21 @@ end of this document. Changes to the sysfs interface done by the kernel | |||
134 | subsystems are not documented here, nor are they tracked by this | 134 | subsystems are not documented here, nor are they tracked by this |
135 | attribute. | 135 | attribute. |
136 | 136 | ||
137 | Changes to the thinkpad-acpi sysfs interface are only considered | ||
138 | non-experimental when they are submitted to Linux mainline, at which | ||
139 | point the changes in this interface are documented and interface_version | ||
140 | may be updated. If you are using any thinkpad-acpi features not yet | ||
141 | sent to mainline for merging, you do so on your own risk: these features | ||
142 | may disappear, or be implemented in a different and incompatible way by | ||
143 | the time they are merged in Linux mainline. | ||
144 | |||
145 | Changes that are backwards-compatible by nature (e.g. the addition of | ||
146 | attributes that do not change the way the other attributes work) do not | ||
147 | always warrant an update of interface_version. Therefore, one must | ||
148 | expect that an attribute might not be there, and deal with it properly | ||
149 | (an attribute not being there *is* a valid way to make it clear that a | ||
150 | feature is not available in sysfs). | ||
151 | |||
137 | Hot keys | 152 | Hot keys |
138 | -------- | 153 | -------- |
139 | 154 | ||
@@ -989,3 +1004,5 @@ Sysfs interface changelog: | |||
989 | 1004 | ||
990 | 0x000100: Initial sysfs support, as a single platform driver and | 1005 | 0x000100: Initial sysfs support, as a single platform driver and |
991 | device. | 1006 | device. |
1007 | 0x000200: Hot key support for 32 hot keys, and radio slider switch | ||
1008 | support. | ||
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 3cf37bb55e9a..4d7189330ec1 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -22,7 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define IBM_VERSION "0.14" | 24 | #define IBM_VERSION "0.14" |
25 | #define TPACPI_SYSFS_VERSION 0x000100 | 25 | #define TPACPI_SYSFS_VERSION 0x000200 |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * Changelog: | 28 | * Changelog: |