Skip to content

Commit ede2e7c

Browse files
dtordtor
committed
Merge branch 'next' into for-linus
Prepare input updates for 4.13 merge window.
2 parents 9768935 + 6593813 commit ede2e7c

File tree

34 files changed

+1349
-71
lines changed

34 files changed

+1349
-71
lines changed

‎Documentation/devicetree/bindings/input/dlink,dir685-touchkeys.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
* D-Link DIR-685 Touchkeys
2+
3+
This is a I2C one-off touchkey controller based on the Cypress Semiconductor
4+
CY8C214 MCU with some firmware in its internal 8KB flash. The circuit
5+
board inside the router is named E119921.
6+
7+
The touchkey device node should be placed inside an I2C bus node.
8+
9+
Required properties:
10+
- compatible: must be "dlink,dir685-touchkeys"
11+
- reg: the I2C address of the touchkeys
12+
- interrupts: reference to the interrupt number
13+
14+
Example:
15+
16+
touchkeys@26 {
17+
compatible = "dlink,dir685-touchkeys";
18+
reg = <0x26>;
19+
interrupt-parent = <&gpio0>;
20+
interrupts = <17 IRQ_TYPE_EDGE_FALLING>;
21+
};

‎Documentation/devicetree/bindings/input/touchscreen/st,stmfts.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
* ST-Microelectronics FingerTip touchscreen controller
2+
3+
The ST-Microelectronics FingerTip device provides a basic touchscreen
4+
functionality. Along with it the user can enable the touchkey which can work as
5+
a basic HOME and BACK key for phones.
6+
7+
The driver supports also hovering as an absolute single touch event with x, y, z
8+
coordinates.
9+
10+
Required properties:
11+
- compatible : must be "st,stmfts"
12+
- reg : I2C slave address, (e.g. 0x49)
13+
- interrupt-parent : the phandle to the interrupt controller which provides
14+
the interrupt
15+
- interrupts : interrupt specification
16+
- avdd-supply : analogic power supply
17+
- vdd-supply : power supply
18+
- touchscreen-size-x : see touchscreen.txt
19+
- touchscreen-size-y : see touchscreen.txt
20+
21+
Optional properties:
22+
- touch-key-connected : specifies whether the touchkey feature is connected
23+
- ledvdd-supply : power supply to the touch key leds
24+
25+
Example:
26+
27+
i2c@00000000 {
28+
29+
/* ... */
30+
31+
touchscreen@49 {
32+
compatible = "st,stmfts";
33+
reg = <0x49>;
34+
interrupt-parent = <&gpa1>;
35+
interrupts = <1 IRQ_TYPE_NONE>;
36+
touchscreen-size-x = <1599>;
37+
touchscreen-size-y = <2559>;
38+
touch-key-connected;
39+
avdd-supply = <&ldo30_reg>;
40+
vdd-supply = <&ldo31_reg>;
41+
ledvdd-supply = <&ldo33_reg>;
42+
};
43+
};

‎MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3786,6 +3786,12 @@ S: Supported
37863786
F: drivers/input/touchscreen/cyttsp*
37873787
F: include/linux/input/cyttsp.h
37883788

3789+
D-LINK DIR-685 TOUCHKEYS DRIVER
3790+
M: Linus Walleij <linus.walleij@linaro.org>
3791+
L: linux-input@vger.kernel.org
3792+
S: Supported
3793+
F: drivers/input/dlink-dir685-touchkeys.c
3794+
37893795
DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
37903796
M: Joshua Kinard <kumba@gentoo.org>
37913797
S: Maintained
@@ -6598,8 +6604,10 @@ S: Maintained
65986604
F: drivers/input/
65996605
F: include/linux/input.h
66006606
F: include/uapi/linux/input.h
6607+
F: include/uapi/linux/input-event-codes.h
66016608
F: include/linux/input/
66026609
F: Documentation/devicetree/bindings/input/
6610+
F: Documentation/input/
66036611

66046612
INPUT MULTITOUCH (MT) PROTOCOL
66056613
M: Henrik Rydberg <rydberg@bitmath.org>

‎arch/sh/boards/mach-ecovec24/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <linux/usb/r8a66597.h>
2525
#include <linux/usb/renesas_usbhs.h>
2626
#include <linux/i2c.h>
27-
#include <linux/i2c/tsc2007.h>
27+
#include <linux/platform_data/tsc2007.h>
2828
#include <linux/spi/spi.h>
2929
#include <linux/spi/sh_msiof.h>
3030
#include <linux/spi/mmc_spi.h>

‎drivers/input/input.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ EXPORT_SYMBOL(input_inject_event);
481481
void input_alloc_absinfo(struct input_dev *dev)
482482
{
483483
if (!dev->absinfo)
484-
dev->absinfo = kcalloc(ABS_CNT, sizeof(struct input_absinfo),
484+
dev->absinfo = kcalloc(ABS_CNT, sizeof(*dev->absinfo),
485485
GFP_KERNEL);
486486

487487
WARN(!dev->absinfo, "%s(): kcalloc() failed?\n", __func__);
@@ -1126,7 +1126,7 @@ static void input_seq_print_bitmap(struct seq_file *seq, const char *name,
11261126
* If no output was produced print a single 0.
11271127
*/
11281128
if (skip_empty)
1129-
seq_puts(seq, "0");
1129+
seq_putc(seq, '0');
11301130

11311131
seq_putc(seq, '\n');
11321132
}
@@ -1144,7 +1144,7 @@ static int input_devices_seq_show(struct seq_file *seq, void *v)
11441144
seq_printf(seq, "P: Phys=%s\n", dev->phys ? dev->phys : "");
11451145
seq_printf(seq, "S: Sysfs=%s\n", path ? path : "");
11461146
seq_printf(seq, "U: Uniq=%s\n", dev->uniq ? dev->uniq : "");
1147-
seq_printf(seq, "H: Handlers=");
1147+
seq_puts(seq, "H: Handlers=");
11481148

11491149
list_for_each_entry(handle, &dev->h_list, d_node)
11501150
seq_printf(seq, "%s ", handle->name);
@@ -1783,7 +1783,7 @@ struct input_dev *input_allocate_device(void)
17831783
static atomic_t input_no = ATOMIC_INIT(-1);
17841784
struct input_dev *dev;
17851785

1786-
dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
1786+
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
17871787
if (dev) {
17881788
dev->dev.type = &input_dev_type;
17891789
dev->dev.class = &input_class;
@@ -1849,7 +1849,7 @@ struct input_dev *devm_input_allocate_device(struct device *dev)
18491849
struct input_devres *devres;
18501850

18511851
devres = devres_alloc(devm_input_device_release,
1852-
sizeof(struct input_devres), GFP_KERNEL);
1852+
sizeof(*devres), GFP_KERNEL);
18531853
if (!devres)
18541854
return NULL;
18551855

@@ -2099,7 +2099,7 @@ int input_register_device(struct input_dev *dev)
20992099

21002100
if (dev->devres_managed) {
21012101
devres = devres_alloc(devm_input_device_unregister,
2102-
sizeof(struct input_devres), GFP_KERNEL);
2102+
sizeof(*devres), GFP_KERNEL);
21032103
if (!devres)
21042104
return -ENOMEM;
21052105

0 commit comments

Comments
 (0)