releases/upstream/2.6.24-rc4/0001-ACPI-thinkpad-acpi-revert-keymap-changes.patch

   1 From e927c08da53e5c87ca07f7a828d4a0048e7bacf0 Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Tue, 30 Oct 2007 17:46:19 -0200
   4 Subject: [PATCH 16/23] ACPI: thinkpad-acpi: revert keymap changes
   5
   6 Revert commit fba956c46a72f9e7503fd464ffee43c632307e31, "Map volume and
   7 brightness events on thinkpads".
   8
   9 That commit made some modifications to the default keymaps that cause bad
  10 behaviour on all IBM ThinkPads if HAL doesn't know to change them into
  11 passive (on-screen-display only) events.
  12
  13 The proper solution for IBM ThinkPads is to use the _NOTIFY version of the
  14 key codes for the IBM default map (which are not available in mainline
  15 yet), and for the Lenovo keymap, it will take some studying of the various
  16 DSDTs and testing to know the best path (which I will do shortly).
  17
  18 For more data, refer to:
  19 http://thread.gmane.org/gmane.linux.kernel/591037/focus=591045
  20
  21 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  22 Cc: Jeremy Katz <katzj@redhat.com>
  23 Signed-off-by: Len Brown <len.brown@intel.com>
  24 ---
  25  drivers/misc/thinkpad_acpi.c |   16 ++++++++--------
  26  1 files changed, 8 insertions(+), 8 deletions(-)
  27
  28 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
  29 index e953276..63b1e26 100644
  30 --- a/drivers/misc/thinkpad_acpi.c
  31 +++ b/drivers/misc/thinkpad_acpi.c
  32 @@ -964,15 +964,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
  33                 KEY_UNKNOWN,    /* 0x0C: FN+BACKSPACE */
  34                 KEY_UNKNOWN,    /* 0x0D: FN+INSERT */
  35                 KEY_UNKNOWN,    /* 0x0E: FN+DELETE */
  36 -               KEY_BRIGHTNESSUP,       /* 0x0F: FN+HOME (brightness up) */
  37 +               KEY_RESERVED,   /* 0x0F: FN+HOME (brightness up) */
  38                 /* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */
  39 -               KEY_BRIGHTNESSDOWN,     /* 0x10: FN+END (brightness down) */
  40 +               KEY_RESERVED,   /* 0x10: FN+END (brightness down) */
  41                 KEY_RESERVED,   /* 0x11: FN+PGUP (thinklight toggle) */
  42                 KEY_UNKNOWN,    /* 0x12: FN+PGDOWN */
  43                 KEY_ZOOM,       /* 0x13: FN+SPACE (zoom) */
  44 -               KEY_VOLUMEUP,   /* 0x14: VOLUME UP */
  45 -               KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
  46 -               KEY_MUTE,       /* 0x16: MUTE */
  47 +               KEY_RESERVED,   /* 0x14: VOLUME UP */
  48 +               KEY_RESERVED,   /* 0x15: VOLUME DOWN */
  49 +               KEY_RESERVED,   /* 0x16: MUTE */
  50                 KEY_VENDOR,     /* 0x17: Thinkpad/AccessIBM/Lenovo */
  51                 /* (assignments unknown, please report if found) */
  52                 KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
  53 @@ -993,9 +993,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
  54                 KEY_RESERVED,   /* 0x11: FN+PGUP (thinklight toggle) */
  55                 KEY_UNKNOWN,    /* 0x12: FN+PGDOWN */
  56                 KEY_ZOOM,       /* 0x13: FN+SPACE (zoom) */
  57 -               KEY_VOLUMEUP,   /* 0x14: VOLUME UP */
  58 -               KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
  59 -               KEY_MUTE,       /* 0x16: MUTE */
  60 +               KEY_RESERVED,   /* 0x14: VOLUME UP */
  61 +               KEY_RESERVED,   /* 0x15: VOLUME DOWN */
  62 +               KEY_RESERVED,   /* 0x16: MUTE */
  63                 KEY_VENDOR,     /* 0x17: Thinkpad/AccessIBM/Lenovo */
  64                 /* (assignments unknown, please report if found) */
  65                 KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
  66 --
  67 1.5.3.4
  68