| Message ID | 1469674074-15334-2-git-send-email-alex.hung@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 28/07/16 03:47, Alex Hung wrote: > Newer ideapads support a new mic hotkey implemented via an ACPI > interface. This patch converts the mic mute event to a keycode > KEY_MICMUTE. > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > Acked-by: Ike Panhc <ike.pan@canonical.com> > Signed-off-by: Darren Hart <dvhart@linux.intel.com> > (cherry picked from commit 48f67d62194952617dcade08194abc7f5cb3f50c) > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > drivers/platform/x86/ideapad-laptop.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c > index be3bc2f..ab162f0 100644 > --- a/drivers/platform/x86/ideapad-laptop.c > +++ b/drivers/platform/x86/ideapad-laptop.c > @@ -563,6 +563,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv) > static const struct key_entry ideapad_keymap[] = { > { KE_KEY, 6, { KEY_SWITCHVIDEOMODE } }, > { KE_KEY, 7, { KEY_CAMERA } }, > + { KE_KEY, 8, { KEY_MICMUTE } }, > { KE_KEY, 11, { KEY_F16 } }, > { KE_KEY, 13, { KEY_WLAN } }, > { KE_KEY, 16, { KEY_PROG1 } }, > @@ -805,6 +806,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) > break; > case 13: > case 11: > + case 8: > case 7: > case 6: > ideapad_input_report(priv, vpc_bit); > Clean upstream cherry pick, minor functionality change to a platform driver, seems OK to me. Acked-by: Colin Ian King <colin.king@canonical.com>
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index be3bc2f..ab162f0 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -563,6 +563,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv) static const struct key_entry ideapad_keymap[] = { { KE_KEY, 6, { KEY_SWITCHVIDEOMODE } }, { KE_KEY, 7, { KEY_CAMERA } }, + { KE_KEY, 8, { KEY_MICMUTE } }, { KE_KEY, 11, { KEY_F16 } }, { KE_KEY, 13, { KEY_WLAN } }, { KE_KEY, 16, { KEY_PROG1 } }, @@ -805,6 +806,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) break; case 13: case 11: + case 8: case 7: case 6: ideapad_input_report(priv, vpc_bit);