diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-01-05 18:17:17 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2017-01-06 08:35:27 +0100 |
| commit | ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd (patch) | |
| tree | e40970677e591657759d93ecdbd35c922786f7ac /arch/x86/platform/intel-mid/device_libs | |
| parent | x86/platform/intel-mid: Get rid of duplication of IPC handler (diff) | |
| download | linux-dev-ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd.tar.xz linux-dev-ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd.zip | |
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>
Diffstat (limited to 'arch/x86/platform/intel-mid/device_libs')
| -rw-r--r-- | arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c | 3 |
1 files changed, 3 insertions, 0 deletions
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}, |