aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2008-01-08 10:02:53 -0500
committerLen Brown <len.brown@intel.com>2008-02-01 22:26:08 -0500
commitd1edb2b5f1d016d679600cccf2716e0134fff917 (patch)
treed6b5abd280b74fa4c5ac19ddb0e47bdef6462753
parenta713b4d7bca51e56cdb5357507f46674111d032c (diff)
ACPI: thinkpad-acpi: add X61t HKEY events
Tomas Carnecky reports that events 0x5009 and 0x500a are swivel events, and that 0x500b/0x500c are tablet pen storage bay events. Document these events, and avoid nasty messages when they happen. 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.txt4
-rw-r--r--drivers/misc/thinkpad_acpi.c9
2 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
index 9d08e472ef74..e1c4550dac99 100644
--- a/Documentation/thinkpad-acpi.txt
+++ b/Documentation/thinkpad-acpi.txt
@@ -499,6 +499,10 @@ The above events are never propagated by the driver.
499 499
5000x3003 Bay ejection (see 0x2x05) complete, can sleep again 5000x3003 Bay ejection (see 0x2x05) complete, can sleep again
5010x4003 Undocked (see 0x2x04), can sleep again 5010x4003 Undocked (see 0x2x04), can sleep again
5020x5009 Tablet swivel: switched to tablet mode
5030x500A Tablet swivel: switched to normal mode
5040x500B Tablet pen insterted into its storage bay
5050x500C Tablet pen removed from its storage bay
5020x5010 Brightness level changed (newer Lenovo BIOSes) 5060x5010 Brightness level changed (newer Lenovo BIOSes)
503 507
504The above events are propagated by the driver. 508The above events are propagated by the driver.
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 9b0235dc5308..049ec42c77be 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -2127,10 +2127,13 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
2127 } 2127 }
2128 break; 2128 break;
2129 case 5: 2129 case 5:
2130 /* 0x5000-0x5FFF: On screen display helpers */ 2130 /* 0x5000-0x5FFF: human interface helpers */
2131 switch (hkey) { 2131 switch (hkey) {
2132 case 0x5010: 2132 case 0x5010: /* Lenovo new BIOS: brightness changed */
2133 /* Lenovo Vista BIOS: brightness changed */ 2133 case 0x5009: /* X61t: swivel up (tablet mode) */
2134 case 0x500a: /* X61t: swivel down (normal mode) */
2135 case 0x500b: /* X61t: tablet pen inserted into bay */
2136 case 0x500c: /* X61t: tablet pen removed from bay */
2134 break; 2137 break;
2135 case 0x5001: 2138 case 0x5001:
2136 case 0x5002: 2139 case 0x5002: