Skip to content

Commit 4bcf69e

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: - an update to Elan touchpad controller driver supporting newer ICs with enhanced precision reports and a new firmware update process - an update to EXC3000 touch controller supporting additional parts - assorted driver fixups * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (27 commits) Input: exc3000 - add support to query model and fw_version Input: exc3000 - add reset gpio support Input: exc3000 - add EXC80H60 and EXC80H84 support dt-bindings: touchscreen: Convert EETI EXC3000 touchscreen to json-schema Input: sentelic - fix error return when fsp_reg_write fails Input: alps - remove redundant assignment to variable ret Input: ims-pcu - return error code rather than -ENOMEM Input: elan_i2c - add ic type 0x15 Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary Input: uinput - fix typo in function name documentation Input: ati_remote2 - add missing newlines when printing module parameters Input: psmouse - add a newline when printing 'proto' by sysfs Input: synaptics-rmi4 - drop a duplicated word Input: elan_i2c - add support for high resolution reports Input: elan_i2c - do not constantly re-query pattern ID Input: elan_i2c - add firmware update info for ICs 0x11, 0x13, 0x14 Input: elan_i2c - handle firmware updated on newer ICs Input: elan_i2c - add support for different firmware page sizes Input: elan_i2c - fix detecting IAP version on older controllers Input: elan_i2c - handle devices with patterns above 1 ...
2 parents b7b8e36 + 9e82380 commit 4bcf69e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+718
-265
lines changed

‎Documentation/ABI/testing/sysfs-driver-input-exc3000

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/i2c/devices/xxx/fw_version
2+
Date: Aug 2020
3+
Contact: [email protected]
4+
Description: Reports the firmware version provided by the touchscreen, for example "00_T6" on a EXC80H60
5+
6+
Access: Read
7+
Valid values: Represented as string
8+
9+
What: /sys/bus/i2c/devices/xxx/model
10+
Date: Aug 2020
11+
Contact: [email protected]
12+
Description: Reports the model identification provided by the touchscreen, for example "Orion_1320" on a EXC80H60
13+
14+
Access: Read
15+
Valid values: Represented as string

‎Documentation/devicetree/bindings/input/touchscreen/eeti,exc3000.yaml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/touchscreen/eeti,exc3000.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: EETI EXC3000 series touchscreen controller
8+
9+
maintainers:
10+
- Dmitry Torokhov <[email protected]>
11+
12+
allOf:
13+
- $ref: touchscreen.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- eeti,exc3000
19+
- eeti,exc80h60
20+
- eeti,exc80h84
21+
reg:
22+
const: 0x2a
23+
interrupts:
24+
maxItems: 1
25+
reset-gpios:
26+
maxItems: 1
27+
touchscreen-size-x: true
28+
touchscreen-size-y: true
29+
touchscreen-inverted-x: true
30+
touchscreen-inverted-y: true
31+
touchscreen-swapped-x-y: true
32+
33+
required:
34+
- compatible
35+
- reg
36+
- interrupts
37+
- touchscreen-size-x
38+
- touchscreen-size-y
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
#include "dt-bindings/interrupt-controller/irq.h"
45+
i2c {
46+
#address-cells = <1>;
47+
#size-cells = <0>;
48+
touchscreen@2a {
49+
compatible = "eeti,exc3000";
50+
reg = <0x2a>;
51+
interrupt-parent = <&gpio1>;
52+
interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
53+
touchscreen-size-x = <4096>;
54+
touchscreen-size-y = <4096>;
55+
touchscreen-inverted-x;
56+
touchscreen-swapped-x-y;
57+
};
58+
};

‎Documentation/devicetree/bindings/input/touchscreen/exc3000.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Documentation/input/uinput.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ the sake of simplicity.
9999
100100
/*
101101
* Give userspace some time to read the events before we destroy the
102-
* device with UI_DEV_DESTOY.
102+
* device with UI_DEV_DESTROY.
103103
*/
104104
sleep(1);
105105
@@ -164,7 +164,7 @@ mouse.
164164
165165
/*
166166
* Give userspace some time to read the events before we destroy the
167-
* device with UI_DEV_DESTOY.
167+
* device with UI_DEV_DESTROY.
168168
*/
169169
sleep(1);
170170
@@ -233,7 +233,7 @@ but interact with uinput via ioctl calls, or use libevdev.
233233
234234
/*
235235
* Give userspace some time to read the events before we destroy the
236-
* device with UI_DEV_DESTOY.
236+
* device with UI_DEV_DESTROY.
237237
*/
238238
sleep(1);
239239

‎drivers/input/input-mt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static void copy_abs(struct input_dev *dev, unsigned int dst, unsigned int src)
1616
if (dev->absinfo && test_bit(src, dev->absbit)) {
1717
dev->absinfo[dst] = dev->absinfo[src];
1818
dev->absinfo[dst].fuzz = 0;
19-
dev->absbit[BIT_WORD(dst)] |= BIT_MASK(dst);
19+
__set_bit(dst, dev->absbit);
2020
}
2121
}
2222

‎drivers/input/joystick/db9.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static unsigned char db9_saturn_read_packet(struct parport *port, unsigned char
247247
db9_saturn_write_sub(port, type, 3, powered, 0);
248248
return data[0] = 0xe3;
249249
}
250-
/* fall through */
250+
fallthrough;
251251
default:
252252
return data[0];
253253
}
@@ -267,14 +267,14 @@ static int db9_saturn_report(unsigned char id, unsigned char data[60], struct in
267267
switch (data[j]) {
268268
case 0x16: /* multi controller (analog 4 axis) */
269269
input_report_abs(dev, db9_abs[5], data[j + 6]);
270-
/* fall through */
270+
fallthrough;
271271
case 0x15: /* mission stick (analog 3 axis) */
272272
input_report_abs(dev, db9_abs[3], data[j + 4]);
273273
input_report_abs(dev, db9_abs[4], data[j + 5]);
274-
/* fall through */
274+
fallthrough;
275275
case 0x13: /* racing controller (analog 1 axis) */
276276
input_report_abs(dev, db9_abs[2], data[j + 3]);
277-
/* fall through */
277+
fallthrough;
278278
case 0x34: /* saturn keyboard (udlr ZXC ASD QE Esc) */
279279
case 0x02: /* digital pad (digital 2 axis + buttons) */
280280
input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
@@ -368,7 +368,7 @@ static void db9_timer(struct timer_list *t)
368368
input_report_abs(dev2, ABS_X, (data & DB9_RIGHT ? 0 : 1) - (data & DB9_LEFT ? 0 : 1));
369369
input_report_abs(dev2, ABS_Y, (data & DB9_DOWN ? 0 : 1) - (data & DB9_UP ? 0 : 1));
370370
input_report_key(dev2, BTN_TRIGGER, ~data & DB9_FIRE1);
371-
/* fall through */
371+
fallthrough;
372372

373373
case DB9_MULTI_0802:
374374

‎drivers/input/joystick/gamecon.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ static void gc_multi_process_packet(struct gc *gc)
485485
switch (pad->type) {
486486
case GC_MULTI2:
487487
input_report_key(dev, BTN_THUMB, s & data[5]);
488-
/* fall through */
488+
fallthrough;
489489

490490
case GC_MULTI:
491491
input_report_abs(dev, ABS_X,
@@ -638,7 +638,7 @@ static void gc_psx_report_one(struct gc_pad *pad, unsigned char psx_type,
638638

639639
input_report_key(dev, BTN_THUMBL, ~data[0] & 0x04);
640640
input_report_key(dev, BTN_THUMBR, ~data[0] & 0x02);
641-
/* fall through */
641+
fallthrough;
642642

643643
case GC_PSX_NEGCON:
644644
case GC_PSX_ANALOG:
@@ -872,15 +872,17 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type)
872872
case GC_SNES:
873873
for (i = 4; i < 8; i++)
874874
input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);
875-
/* fall through */
875+
fallthrough;
876+
876877
case GC_NES:
877878
for (i = 0; i < 4; i++)
878879
input_set_capability(input_dev, EV_KEY, gc_snes_btn[i]);
879880
break;
880881

881882
case GC_MULTI2:
882883
input_set_capability(input_dev, EV_KEY, BTN_THUMB);
883-
/* fall through */
884+
fallthrough;
885+
884886
case GC_MULTI:
885887
input_set_capability(input_dev, EV_KEY, BTN_TRIGGER);
886888
/* fall through */

‎drivers/input/joystick/sidewinder.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -656,16 +656,19 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
656656

657657
switch (i * m) {
658658
case 60:
659-
sw->number++; /* fall through */
659+
sw->number++;
660+
fallthrough;
660661
case 45: /* Ambiguous packet length */
661662
if (j <= 40) { /* ID length less or eq 40 -> FSP */
662663
case 43:
663664
sw->type = SW_ID_FSP;
664665
break;
665666
}
666-
sw->number++; /* fall through */
667+
sw->number++;
668+
fallthrough;
667669
case 30:
668-
sw->number++; /* fall through */
670+
sw->number++;
671+
fallthrough;
669672
case 15:
670673
sw->type = SW_ID_GP;
671674
break;
@@ -681,9 +684,11 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
681684
sw->type = SW_ID_PP;
682685
break;
683686
case 66:
684-
sw->bits = 3; /* fall through */
687+
sw->bits = 3;
688+
fallthrough;
685689
case 198:
686-
sw->length = 22; /* fall through */
690+
sw->length = 22;
691+
fallthrough;
687692
case 64:
688693
sw->type = SW_ID_3DP;
689694
if (j == 160)

‎drivers/input/joystick/spaceball.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ static irqreturn_t spaceball_interrupt(struct serio *serio,
146146
break;
147147
}
148148
spaceball->escape = 0;
149-
/* fall through */
149+
fallthrough;
150150
case 'M':
151151
case 'Q':
152152
case 'S':
153153
if (spaceball->escape) {
154154
spaceball->escape = 0;
155155
data &= 0x1f;
156156
}
157-
/* fall through */
157+
fallthrough;
158158
default:
159159
if (spaceball->escape)
160160
spaceball->escape = 0;
@@ -220,13 +220,13 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
220220
input_dev->keybit[BIT_WORD(BTN_A)] |= BIT_MASK(BTN_A) |
221221
BIT_MASK(BTN_B) | BIT_MASK(BTN_C) |
222222
BIT_MASK(BTN_MODE);
223-
/* fall through */
223+
fallthrough;
224224
default:
225225
input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_2) |
226226
BIT_MASK(BTN_3) | BIT_MASK(BTN_4) |
227227
BIT_MASK(BTN_5) | BIT_MASK(BTN_6) |
228228
BIT_MASK(BTN_7) | BIT_MASK(BTN_8);
229-
/* fall through */
229+
fallthrough;
230230
case SPACEBALL_3003C:
231231
input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_1) |
232232
BIT_MASK(BTN_8);

‎drivers/input/keyboard/adp5589-keys.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ static int adp5589_probe(struct i2c_client *client,
10161016
switch (id->driver_data) {
10171017
case ADP5585_02:
10181018
kpad->support_row5 = true;
1019-
/* fall through */
1019+
fallthrough;
10201020
case ADP5585_01:
10211021
kpad->is_adp5585 = true;
10221022
kpad->var = &const_adp5585;

0 commit comments

Comments
 (0)