eeepc-wmi: add camera keys

These keys are supposed to be handled by any software
using the camera (like webKam or cheese...). They can
also be used to actually move the camera when possible.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index eea8c942653b2ca4033ad93c19012c04cf84166e..d3997757e790f3fa1fa22e09559ac792a18c18a3 100644 (file)
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -114,11 +114,18 @@ static const struct key_entry eeepc_wmi_keymap[] = {
        { KE_KEY, 0x5c, { KEY_F15 } }, /* Power Gear key */
        { KE_KEY, 0x5d, { KEY_WLAN } },
        { KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */
+       { KE_KEY, 0x82, { KEY_CAMERA } },
+       { KE_KEY, 0x83, { KEY_CAMERA_ZOOMIN } },
        { KE_KEY, 0x88, { KEY_WLAN } },
        { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },
        { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */
        { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */
        { KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } },
+       { KE_KEY, 0xeb, { KEY_CAMERA_ZOOMOUT } },
+       { KE_KEY, 0xec, { KEY_CAMERA_UP } },
+       { KE_KEY, 0xed, { KEY_CAMERA_DOWN } },
+       { KE_KEY, 0xee, { KEY_CAMERA_LEFT } },
+       { KE_KEY, 0xef, { KEY_CAMERA_RIGHT } },
        { KE_END, 0},
 };
 

diff --git a/include/linux/input.h b/include/linux/input.h
index 056ae8a5bd9b8bb3424c431ff60bcc22c155b4da..f3a7794a18c4d6de24065f797baf4ba97c34694b 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -664,6 +664,13 @@ struct input_keymap_entry {
 #define KEY_TOUCHPAD_ON                0x213
 #define KEY_TOUCHPAD_OFF       0x214
 
+#define KEY_CAMERA_ZOOMIN      0x215
+#define KEY_CAMERA_ZOOMOUT     0x216
+#define KEY_CAMERA_UP          0x217
+#define KEY_CAMERA_DOWN                0x218
+#define KEY_CAMERA_LEFT                0x219
+#define KEY_CAMERA_RIGHT       0x21a
+
 #define BTN_TRIGGER_HAPPY              0x2c0
 #define BTN_TRIGGER_HAPPY1             0x2c0
 #define BTN_TRIGGER_HAPPY2             0x2c1