Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'input-for-v5.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:

- a new set of keycodes to be used by marine navigation systems

- minor fixes to omap4-keypad and cypress-sf drivers

* tag 'input-for-v5.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: add Marine Navigation Keycodes
Input: omap4-keypad - fix pm_runtime_get_sync() error checking
Input: cypress-sf - register a callback to disable the regulators

+36 -1
+14
drivers/input/keyboard/cypress-sf.c
··· 61 61 return IRQ_HANDLED; 62 62 } 63 63 64 + static void cypress_sf_disable_regulators(void *arg) 65 + { 66 + struct cypress_sf_data *touchkey = arg; 67 + 68 + regulator_bulk_disable(ARRAY_SIZE(touchkey->regulators), 69 + touchkey->regulators); 70 + } 71 + 64 72 static int cypress_sf_probe(struct i2c_client *client) 65 73 { 66 74 struct cypress_sf_data *touchkey; ··· 128 120 "Failed to enable regulators: %d\n", error); 129 121 return error; 130 122 } 123 + 124 + error = devm_add_action_or_reset(&client->dev, 125 + cypress_sf_disable_regulators, 126 + touchkey); 127 + if (error) 128 + return error; 131 129 132 130 touchkey->input_dev = devm_input_allocate_device(&client->dev); 133 131 if (!touchkey->input_dev) {
+1 -1
drivers/input/keyboard/omap4-keypad.c
··· 393 393 * revision register. 394 394 */ 395 395 error = pm_runtime_get_sync(dev); 396 - if (error) { 396 + if (error < 0) { 397 397 dev_err(dev, "pm_runtime_get_sync() failed\n"); 398 398 pm_runtime_put_noidle(dev); 399 399 return error;
+21
include/uapi/linux/input-event-codes.h
··· 662 662 /* Select an area of screen to be copied */ 663 663 #define KEY_SELECTIVE_SCREENSHOT 0x27a 664 664 665 + /* Move the focus to the next or previous user controllable element within a UI container */ 666 + #define KEY_NEXT_ELEMENT 0x27b 667 + #define KEY_PREVIOUS_ELEMENT 0x27c 668 + 669 + /* Toggle Autopilot engagement */ 670 + #define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d 671 + 672 + /* Shortcut Keys */ 673 + #define KEY_MARK_WAYPOINT 0x27e 674 + #define KEY_SOS 0x27f 675 + #define KEY_NAV_CHART 0x280 676 + #define KEY_FISHING_CHART 0x281 677 + #define KEY_SINGLE_RANGE_RADAR 0x282 678 + #define KEY_DUAL_RANGE_RADAR 0x283 679 + #define KEY_RADAR_OVERLAY 0x284 680 + #define KEY_TRADITIONAL_SONAR 0x285 681 + #define KEY_CLEARVU_SONAR 0x286 682 + #define KEY_SIDEVU_SONAR 0x287 683 + #define KEY_NAV_INFO 0x288 684 + #define KEY_BRIGHTNESS_MENU 0x289 685 + 665 686 /* 666 687 * Some keyboards have keys which do not have a defined meaning, these keys 667 688 * are intended to be programmed / bound to macros by the user. For most