From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Apr 2019 17:28:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=240206fcab661afe9bed72e8704cef1d6e83e338;p=linux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:

 - several new key mappings for HID

 - a host of new ACPI IDs used to identify Elan touchpads in Lenovo
   laptops

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
  HID: input: add mapping for "Toggle Display" key
  HID: input: add mapping for "Full Screen" key
  HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys
  HID: input: add mapping for Expose/Overview key
  HID: input: fix mapping of aspect ratio key
  [media] doc-rst: switch to new names for Full Screen/Aspect keys
  Input: document meanings of KEY_SCREEN and KEY_ZOOM
  Input: elan_i2c - add hardware ID for multiple Lenovo laptops
---

240206fcab661afe9bed72e8704cef1d6e83e338
diff --cc drivers/hid/hid-input.c
index 1fce0076e7dc4,da76358cde06f..b607286a0bc82
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@ -1022,12 -1022,10 +1034,13 @@@ static void hidinput_configure_usage(st
  		case 0x22d: map_key_clear(KEY_ZOOMIN);		break;
  		case 0x22e: map_key_clear(KEY_ZOOMOUT);		break;
  		case 0x22f: map_key_clear(KEY_ZOOMRESET);	break;
+ 		case 0x232: map_key_clear(KEY_FULL_SCREEN);	break;
  		case 0x233: map_key_clear(KEY_SCROLLUP);	break;
  		case 0x234: map_key_clear(KEY_SCROLLDOWN);	break;
 -		case 0x238: map_rel(REL_HWHEEL);		break;
 +		case 0x238: /* AC Pan */
 +			set_bit(REL_HWHEEL, input->relbit);
 +			map_rel(REL_HWHEEL_HI_RES);
 +			break;
  		case 0x23d: map_key_clear(KEY_EDIT);		break;
  		case 0x25f: map_key_clear(KEY_CANCEL);		break;
  		case 0x269: map_key_clear(KEY_INSERT);		break;