Skip to content

Commit 5414ab3

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - new driver for PhoenixRC Flight Controller Adapter - new driver for RAVE SP Power button - fixes for autosuspend-related deadlocks in a few unput USB dirvers - support for 2nd wheel in ATech PS/2 mouse - fix for ALPS trackpoint detection on Thinkpad L570 and Latitude 7370 - bunch of cleanups in various in PS/2 protocols - other assorted changes and fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits) Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad Input: stmfts, s6sy761 - update my e-mail Input: stmfts - use async probe & suspend/resume to avoid 2s delay Input: ALPS - fix TrackStick detection on Thinkpad L570 and Latitude 7370 Input: xpad - add PDP device id 0x02a4 Input: alps - report pressure of v3 and v7 trackstick Input: pxrc - new driver for PhoenixRC Flight Controller Adapter Input: usbtouchscreen - do not rely on input_dev->users Input: usbtouchscreen - fix deadlock in autosuspend Input: pegasus_notetaker - do not rely on input_dev->users Input: pagasus_notetaker - fix deadlock in autosuspend Input: synaptics_usb - do not rely on input_dev->users Input: synaptics_usb - fix deadlock in autosuspend Input: gpio-keys - add support for wakeup event action Input: appletouch - use true and false for boolean values Input: silead - add Chuwi Hi8 support Input: analog - use get_cycles() on PPC Input: stmpe-keypad - remove VLA usage Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list Input: add RAVE SP Powerbutton driver ...
2 parents 672a9c1 + 664b0ba commit 5414ab3

34 files changed

+1358
-491
lines changed

‎Documentation/devicetree/bindings/input/gpio-keys.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ Optional subnode-properties:
2626
If not specified defaults to 5.
2727
- wakeup-source: Boolean, button can wake-up the system.
2828
(Legacy property supported: "gpio-key,wakeup")
29+
- wakeup-event-action: Specifies whether the key should wake the
30+
system when asserted, when deasserted, or both. This property is
31+
only valid for keys that wake up the system (e.g., when the
32+
"wakeup-source" property is also provided).
33+
Supported values are defined in linux-event-codes.h:
34+
EV_ACT_ASSERTED - asserted
35+
EV_ACT_DEASSERTED - deasserted
36+
EV_ACT_ANY - both asserted and deasserted
2937
- linux,can-disable: Boolean, indicates that button is connected
3038
to dedicated (not shared) interrupt which can be disabled to
3139
suppress events from the button.

‎Documentation/devicetree/bindings/input/zii,rave-sp-pwrbutton.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Zodiac Inflight Innovations RAVE Supervisory Processor Power Button Bindings
2+
3+
RAVE SP input device is a "MFD cell" device corresponding to power
4+
button functionality of RAVE Supervisory Processor. It is expected
5+
that its Device Tree node is specified as a child of the node
6+
corresponding to the parent RAVE SP device (as documented in
7+
Documentation/devicetree/bindings/mfd/zii,rave-sp.txt)
8+
9+
Required properties:
10+
11+
- compatible: Should be "zii,rave-sp-pwrbutton"
12+
13+
Example:
14+
15+
rave-sp {
16+
compatible = "zii,rave-sp-rdu1";
17+
current-speed = <38400>;
18+
19+
pwrbutton {
20+
compatible = "zii,rave-sp-pwrbutton";
21+
};
22+
}

‎Documentation/input/devices/pxrc.rst

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
=======================================================
2+
pxrc - PhoenixRC Flight Controller Adapter
3+
=======================================================
4+
5+
:Author: Marcus Folkesson <[email protected]>
6+
7+
This driver let you use your own RC controller plugged into the
8+
adapter that comes with PhoenixRC [1]_ or other compatible adapters.
9+
10+
The adapter supports 7 analog channels and 1 digital input switch.
11+
12+
Notes
13+
=====
14+
15+
Many RC controllers is able to configure which stick goes to which channel.
16+
This is also configurable in most simulators, so a matching is not necessary.
17+
18+
The driver is generating the following input event for analog channels:
19+
20+
+---------+----------------+
21+
| Channel | Event |
22+
+=========+================+
23+
| 1 | ABS_X |
24+
+---------+----------------+
25+
| 2 | ABS_Y |
26+
+---------+----------------+
27+
| 3 | ABS_RX |
28+
+---------+----------------+
29+
| 4 | ABS_RY |
30+
+---------+----------------+
31+
| 5 | ABS_RUDDER |
32+
+---------+----------------+
33+
| 6 | ABS_THROTTLE |
34+
+---------+----------------+
35+
| 7 | ABS_MISC |
36+
+---------+----------------+
37+
38+
The digital input switch is generated as an `BTN_A` event.
39+
40+
Manual Testing
41+
==============
42+
43+
To test this driver's functionality you may use `input-event` which is part of
44+
the `input layer utilities` suite [2]_.
45+
46+
For example::
47+
48+
> modprobe pxrc
49+
> input-events <devnr>
50+
51+
To print all input events from input `devnr`.
52+
53+
References
54+
==========
55+
56+
.. [1] http://www.phoenix-sim.com/
57+
.. [2] https://www.kraxel.org/cgit/input/

‎drivers/input/joystick/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,14 @@ config JOYSTICK_PSXPAD_SPI_FF
351351

352352
To drive rumble motor a dedicated power supply is required.
353353

354+
config JOYSTICK_PXRC
355+
tristate "PhoenixRC Flight Controller Adapter"
356+
depends on USB_ARCH_HAS_HCD
357+
select USB
358+
help
359+
Say Y here if you want to use the PhoenixRC Flight Controller Adapter.
360+
361+
To compile this driver as a module, choose M here: the
362+
module will be called pxrc.
363+
354364
endif

‎drivers/input/joystick/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ obj-$(CONFIG_JOYSTICK_JOYDUMP) += joydump.o
2323
obj-$(CONFIG_JOYSTICK_MAGELLAN) += magellan.o
2424
obj-$(CONFIG_JOYSTICK_MAPLE) += maplecontrol.o
2525
obj-$(CONFIG_JOYSTICK_PSXPAD_SPI) += psxpad-spi.o
26+
obj-$(CONFIG_JOYSTICK_PXRC) += pxrc.o
2627
obj-$(CONFIG_JOYSTICK_SIDEWINDER) += sidewinder.o
2728
obj-$(CONFIG_JOYSTICK_SPACEBALL) += spaceball.o
2829
obj-$(CONFIG_JOYSTICK_SPACEORB) += spaceorb.o

‎drivers/input/joystick/analog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static unsigned int get_time_pit(void)
163163
#define GET_TIME(x) do { x = (unsigned int)rdtsc(); } while (0)
164164
#define DELTA(x,y) ((y)-(x))
165165
#define TIME_NAME "TSC"
166-
#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV)
166+
#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_PPC) || defined(CONFIG_RISCV)
167167
#define GET_TIME(x) do { x = get_cycles(); } while (0)
168168
#define DELTA(x,y) ((y)-(x))
169169
#define TIME_NAME "get_cycles"

0 commit comments

Comments
 (0)