forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/dtor/input Pull input updates from Dmitry Torokhov: "A new driver for slidebar on Ideapad laptops and a bunch of assorted driver fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits) Input: add SYN_MAX and SYN_CNT constants Input: max11801_ts - convert to devm Input: egalax-ts - fix typo and improve text Input: MAINTAINERS - change maintainer for cyttsp driver Input: cyttsp4 - kill 'defined but not used' compiler warnings Input: add driver for slidebar on Lenovo IdeaPad laptops Input: omap-keypad - set up irq type from DT Input: omap-keypad - enable wakeup capability for keypad. Input: omap-keypad - clear interrupts on open Input: omap-keypad - convert to threaded IRQ Input: omap-keypad - use bitfiled instead of hardcoded values Input: cyttsp4 - remove useless NULL test from cyttsp4_watchdog_timer() Input: wacom - fix error return code in wacom_probe() Input: as5011 - fix error return code in as5011_probe() Input: keyboard, serio - simplify use of devm_ioremap_resource Input: tegra-kbc - simplify use of devm_ioremap_resource Input: htcpen - fix incorrect placement of __initdata Input: qt1070 - add power management ops Input: wistron_btns - add MODULE_DEVICE_TABLE Input: wistron_btns - mark the Medion MD96500 keymap as tested ...
- Loading branch information
Showing
33 changed files
with
770 additions
and
321 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
Input: sysrq reset sequence | ||
|
||
A simple binding to represent a set of keys as described in | ||
include/uapi/linux/input.h. This is to communicate a sequence of keys to the | ||
sysrq driver. Upon holding the keys for a specified amount of time (if | ||
specified) the system is sync'ed and reset. | ||
|
||
Key sequences are global to the system but all the keys in a set must be coming | ||
from the same input device. | ||
|
||
The /chosen node should contain a 'linux,sysrq-reset-seq' child node to define | ||
a set of keys. | ||
|
||
Required property: | ||
sysrq-reset-seq: array of Linux keycodes, one keycode per cell. | ||
|
||
Optional property: | ||
timeout-ms: duration keys must be pressed together in milliseconds before | ||
generating a sysrq. If omitted the system is rebooted immediately when a valid | ||
sequence has been recognized. | ||
|
||
Example: | ||
|
||
chosen { | ||
linux,sysrq-reset-seq { | ||
keyset = <0x03 | ||
0x04 | ||
0x0a>; | ||
timeout-ms = <3000>; | ||
}; | ||
}; | ||
|
||
Would represent KEY_2, KEY_3 and KEY_9. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2494,9 +2494,9 @@ S: Maintained | |
F: drivers/media/common/cypress_firmware* | ||
|
||
CYTTSP TOUCHSCREEN DRIVER | ||
M: Javier Martinez Canillas <[email protected]> | ||
M: Ferruh Yigit <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
S: Supported | ||
F: drivers/input/touchscreen/cyttsp* | ||
F: include/linux/input/cyttsp.h | ||
|
||
|
@@ -4141,6 +4141,13 @@ W: http://launchpad.net/ideapad-laptop | |
S: Maintained | ||
F: drivers/platform/x86/ideapad-laptop.c | ||
|
||
IDEAPAD LAPTOP SLIDEBAR DRIVER | ||
M: Andrey Moiseev <[email protected]> | ||
L: [email protected] | ||
W: https://github.com/o2genum/ideapad-slidebar | ||
S: Maintained | ||
F: drivers/input/misc/ideapad_slidebar.c | ||
|
||
IDE/ATAPI DRIVERS | ||
M: Borislav Petkov <[email protected]> | ||
L: [email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.