From patchwork Wed Feb 18 20:53:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 5847781 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 90EF49F36A for ; Wed, 18 Feb 2015 20:55:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE8FA2012E for ; Wed, 18 Feb 2015 20:55:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E96AB2013D for ; Wed, 18 Feb 2015 20:55:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbbBRUzX (ORCPT ); Wed, 18 Feb 2015 15:55:23 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:34858 "EHLO relay6-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753337AbbBRUzV (ORCPT ); Wed, 18 Feb 2015 15:55:21 -0500 Received: from mfilter5-d.gandi.net (mfilter5-d.gandi.net [217.70.178.132]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id F2FE1FB8B9; Wed, 18 Feb 2015 21:55:19 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter5-d.gandi.net Received: from relay6-d.mail.gandi.net ([217.70.183.198]) by mfilter5-d.gandi.net (mfilter5-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id pyH9boDp49GB; Wed, 18 Feb 2015 21:55:18 +0100 (CET) X-Originating-IP: 83.155.44.161 Received: from nuvo (mon69-7-83-155-44-161.fbx.proxad.net [83.155.44.161]) (Authenticated sender: hadess@hadess.net) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 54E0FFB87D; Wed, 18 Feb 2015 21:55:17 +0100 (CET) Message-ID: <1424292837.32581.50.camel@hadess.net> Subject: [PATCH 6/6] thinkpad_acpi: More Carbon X1 2014 keys From: Bastien Nocera To: Henrique de Moraes Holschuh , Darren Hart , ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Date: Wed, 18 Feb 2015 21:53:57 +0100 X-Mailer: Evolution 3.12.10 (3.12.10-1.fc21) Mime-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for newly added evdev keycodes. Signed-off-by: Bastien Nocera --- 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 */ }, };