From patchwork Mon Jan 10 14:01:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 468981 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0AESo36012558 for ; Mon, 10 Jan 2011 14:28:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753809Ab1AJO2u (ORCPT ); Mon, 10 Jan 2011 09:28:50 -0500 Received: from lxorguk.ukuu.org.uk ([81.2.110.251]:59737 "EHLO lxorguk.ukuu.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752994Ab1AJO2t (ORCPT ); Mon, 10 Jan 2011 09:28:49 -0500 Received: from bob.linux.org.uk (earthlight.etchedpixels.co.uk [81.2.110.250]) by lxorguk.ukuu.org.uk (8.14.4/8.14.1) with ESMTP id p0AEP6uH029165; Mon, 10 Jan 2011 14:25:12 GMT From: Alan Cox Subject: [PATCH] input: Add new button type To: x86@kernel.org, linux-input@vger.kernel.org, jekyll_lai@wistron.com Date: Mon, 10 Jan 2011 14:01:32 +0000 Message-ID: <20110110140131.11536.46959.stgit@bob.linux.org.uk> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 10 Jan 2011 14:28:53 +0000 (UTC) diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c index a9686c3..cc749dc 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c @@ -822,6 +822,8 @@ static struct gpio_keys_button gpio_button[] = { {KEY_CAMERA_FOCUS, -1, 1, "camera_half", EV_KEY, 0, 20}, {SW_KEYPAD_SLIDE, -1, 1, "MagSw1", EV_SW, 0, 20}, {SW_KEYPAD_SLIDE, -1, 1, "MagSw2", EV_SW, 0, 20}, + {KEY_HOMEPAGE, -1, 1, "home_btn", EV_KEY, 0, 20}, + {SW_ROTATE_LOCK, -1, 1, "rot_lock", EV_SW, 0, 20}, }; static struct gpio_keys_platform_data mrst_gpio_keys = { diff --git a/include/linux/input.h b/include/linux/input.h index c4e9d91..79fc30e 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -802,6 +802,7 @@ struct input_keymap_entry { #define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ #define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ +#define SW_ROTATE_LOCK 0x0c /* set = rotate lock */ #define SW_MAX 0x0f #define SW_CNT (SW_MAX+1)