diff options
author | Azael Avalos <coproscefalo@gmail.com> | 2012-01-18 14:44:10 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-03-22 09:31:52 -0400 |
commit | af502837a08c8ca3495d3940d4c4eb4e19a3beaa (patch) | |
tree | 187ba84a071311bd735e22e9acfc79b1fa882eaa /drivers/platform | |
parent | 29cd293f9f8cd76444657622980010b9364b1de6 (diff) |
toshiba_acpi: Support additional hotkey scancodes
These scancodes are used by many of the models now supported with
the addition of TOS1900 device support.
Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 42d73b0f530a..e3e1fa6db004 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
@@ -150,6 +150,8 @@ static const struct key_entry toshiba_acpi_keymap[] __devinitconst = { | |||
150 | { KE_KEY, 0x101, { KEY_MUTE } }, | 150 | { KE_KEY, 0x101, { KEY_MUTE } }, |
151 | { KE_KEY, 0x102, { KEY_ZOOMOUT } }, | 151 | { KE_KEY, 0x102, { KEY_ZOOMOUT } }, |
152 | { KE_KEY, 0x103, { KEY_ZOOMIN } }, | 152 | { KE_KEY, 0x103, { KEY_ZOOMIN } }, |
153 | { KE_KEY, 0x12c, { KEY_KBDILLUMTOGGLE } }, | ||
154 | { KE_KEY, 0x139, { KEY_ZOOMRESET } }, | ||
153 | { KE_KEY, 0x13b, { KEY_COFFEE } }, | 155 | { KE_KEY, 0x13b, { KEY_COFFEE } }, |
154 | { KE_KEY, 0x13c, { KEY_BATTERY } }, | 156 | { KE_KEY, 0x13c, { KEY_BATTERY } }, |
155 | { KE_KEY, 0x13d, { KEY_SLEEP } }, | 157 | { KE_KEY, 0x13d, { KEY_SLEEP } }, |
@@ -158,7 +160,7 @@ static const struct key_entry toshiba_acpi_keymap[] __devinitconst = { | |||
158 | { KE_KEY, 0x140, { KEY_BRIGHTNESSDOWN } }, | 160 | { KE_KEY, 0x140, { KEY_BRIGHTNESSDOWN } }, |
159 | { KE_KEY, 0x141, { KEY_BRIGHTNESSUP } }, | 161 | { KE_KEY, 0x141, { KEY_BRIGHTNESSUP } }, |
160 | { KE_KEY, 0x142, { KEY_WLAN } }, | 162 | { KE_KEY, 0x142, { KEY_WLAN } }, |
161 | { KE_KEY, 0x143, { KEY_PROG1 } }, | 163 | { KE_KEY, 0x143, { KEY_TOUCHPAD_TOGGLE } }, |
162 | { KE_KEY, 0x17f, { KEY_FN } }, | 164 | { KE_KEY, 0x17f, { KEY_FN } }, |
163 | { KE_KEY, 0xb05, { KEY_PROG2 } }, | 165 | { KE_KEY, 0xb05, { KEY_PROG2 } }, |
164 | { KE_KEY, 0xb06, { KEY_WWW } }, | 166 | { KE_KEY, 0xb06, { KEY_WWW } }, |
@@ -168,6 +170,7 @@ static const struct key_entry toshiba_acpi_keymap[] __devinitconst = { | |||
168 | { KE_KEY, 0xb32, { KEY_NEXTSONG } }, | 170 | { KE_KEY, 0xb32, { KEY_NEXTSONG } }, |
169 | { KE_KEY, 0xb33, { KEY_PLAYPAUSE } }, | 171 | { KE_KEY, 0xb33, { KEY_PLAYPAUSE } }, |
170 | { KE_KEY, 0xb5a, { KEY_MEDIA } }, | 172 | { KE_KEY, 0xb5a, { KEY_MEDIA } }, |
173 | { KE_IGNORE, 0x1430, { KEY_RESERVED } }, | ||
171 | { KE_END, 0 }, | 174 | { KE_END, 0 }, |
172 | }; | 175 | }; |
173 | 176 | ||