* [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO keys on Merrifield
@ 2017-01-05 16:17 Andy Shevchenko
2017-01-06 10:59 ` [tip:x86/platform] " tip-bot for Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2017-01-05 16:17 UTC (permalink / raw)
To: Thomas Gleixner, H. Peter Anvin, x86, Ingo Molnar, linux-kernel
Cc: Andy Shevchenko
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>
---
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 52534ec29765..74283875c7e8 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},
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/platform] x86/platform/intel-mid: Enable GPIO keys on Merrifield
2017-01-05 16:17 [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO keys on Merrifield Andy Shevchenko
@ 2017-01-06 10:59 ` tip-bot for Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Andy Shevchenko @ 2017-01-06 10:59 UTC (permalink / raw)
To: linux-tip-commits
Cc: mingo, andriy.shevchenko, linux-kernel, tglx, hpa, peterz, torvalds
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},
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-06 11:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-05 16:17 [PATCH v1 1/1] x86/platform/intel-mid: Enable GPIO keys on Merrifield Andy Shevchenko
2017-01-06 10:59 ` [tip:x86/platform] " tip-bot for Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).