[tip:x86/platform] x86/platform/intel-mid: Enable GPIO keys on Merrifield

From	tip-bot for Andy Shevchenko <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:x86/platform] x86/platform/intel-mid: Enable GPIO keys on Merrifield
Date	2017-01-06 12:10 +0100
Message-ID	<sWAzh-Ta-49@gated-at.bofh.it> (permalink)
References	<sWiVI-5on-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd
Gitweb:     http://git.kernel.org/tip/ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd
Author:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Thu, 5 Jan 2017 18:17:17 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 6 Jan 2017 08:35:27 +0100

x86/platform/intel-mid: Enable GPIO keys on Merrifield

The Merrifield firmware provides 3 descriptions of buttons connected to GPIO.
Append them to the list of supported GPIO keys.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170105161717.115261-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c b/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c
index 52534ec..7428387 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c
@@ -32,6 +32,9 @@ static struct gpio_keys_button gpio_button[] = {
 	{SW_LID,		-1, 1, "lid_switch",	EV_SW,  0, 20},
 	{KEY_VOLUMEUP,		-1, 1, "vol_up",	EV_KEY, 0, 20},
 	{KEY_VOLUMEDOWN,	-1, 1, "vol_down",	EV_KEY, 0, 20},
+	{KEY_MUTE,		-1, 1, "mute_enable",	EV_KEY, 0, 20},
+	{KEY_VOLUMEUP,		-1, 1, "volume_up",	EV_KEY, 0, 20},
+	{KEY_VOLUMEDOWN,	-1, 1, "volume_down",	EV_KEY, 0, 20},
 	{KEY_CAMERA,		-1, 1, "camera_full",	EV_KEY, 0, 20},
 	{KEY_CAMERA_FOCUS,	-1, 1, "camera_half",	EV_KEY, 0, 20},
 	{SW_KEYPAD_SLIDE,	-1, 1, "MagSw1",	EV_SW,  0, 20},

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO keys on Merrifield Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-01-05 17:20 +0100
  [tip:x86/platform] x86/platform/intel-mid: Enable GPIO keys on  Merrifield tip-bot for Andy Shevchenko <tipbot@zytor.com> - 2017-01-06 12:10 +0100

csiph-web