Skip to contentSkip to conversation

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

PATCH New Andy Shevchenko 2 participants 2 messages Jan 5, 2017 – Jan 6, 2017

Subsystems (2)
x86 Intel MID (Mobile Internet Device) platform
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c +3 -0
index 52534ec29765..74283875c7e8 100644
@@ -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},
Signature · 1 line
2.11.0
merge bot
#1 lore raw
x86/platform/intel-mid: Enable GPIO keys on Merrifield
Commit-ID:  ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd
Gitweb:     http://git.kernel.org/tip/ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Thu, 5 Jan 2017 18:17:17 +0200
Committer:  Ingo Molnar <[email protected]>
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 <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c +3 -0
index 52534ec..7428387 100644
@@ -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},