mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Bastien Nocera <hadess@hadess.net>
To: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
	Darren Hart <dvhart@infradead.org>,
	ibm-acpi-devel@lists.sourceforge.net,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org
Subject: [PATCH 6/6] thinkpad_acpi: More Carbon X1 2014 keys
Date: Wed, 18 Feb 2015 21:53:57 +0100	[thread overview]
Message-ID: <1424292837.32581.50.camel@hadess.net> (raw)

Add support for newly added evdev keycodes.

Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
 drivers/platform/x86/thinkpad_acpi.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index a47a56a..90b3f4a 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3264,24 +3264,24 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
 		 * We'll need to offset those by 0x20 */
 		KEY_RESERVED,        /* Mute held, 0x103 */
 		KEY_BRIGHTNESS_MIN,  /* Backlight off */
-		KEY_RESERVED,        /* Clipping tool */
-		KEY_RESERVED,        /* Cloud */
+		KEY_CLIPPING_TOOL,   /* Clipping tool */
+		KEY_CLOUD,           /* Cloud */
 		KEY_RESERVED,
 		KEY_VOICECOMMAND,    /* Voice */
 		KEY_RESERVED,
-		KEY_RESERVED,        /* Gestures */
+		KEY_CAMERA_GESTURES, /* Gestures */
 		KEY_RESERVED,
 		KEY_RESERVED,
 		KEY_RESERVED,
 		KEY_CONFIG,          /* Settings */
-		KEY_RESERVED,        /* New tab */
+		KEY_NEW_TAB,         /* New tab */
 		KEY_REFRESH,         /* Reload */
 		KEY_BACK,            /* Back */
-		KEY_RESERVED,        /* Microphone down */
-		KEY_RESERVED,        /* Microphone up */
-		KEY_RESERVED,        /* Microphone cancellation */
-		KEY_RESERVED,        /* Camera mode */
-		KEY_RESERVED,        /* Rotate display, 0x116 */
+		KEY_MICUP,           /* Microphone down */
+		KEY_MICDOWN,         /* Microphone up */
+		KEY_MICCANCEL_MODE,  /* Microphone cancellation */
+		KEY_CAMERA_ZOOM_MODE,/* Camera mode */
+		KEY_ROTATE_DISPLAY,  /* Rotate display, 0x116 */
 		},
 	};
 
-- 
2.1.0



                 reply	other threads:[~2015-02-18 20:55 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424292837.32581.50.camel@hadess.net \
    --to=hadess@hadess.net \
    --cc=dvhart@infradead.org \
    --cc=ibm-acpi-devel@lists.sourceforge.net \
    --cc=ibm-acpi@hmh.eng.br \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®