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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
"Just a few driver fixups, nothing exciting"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: xen-kbdfront - do not advertise multi-touch pressure support
Input: hideep - fix compile error due to missing include file
Input: elants_i2c - do not clobber interrupt trigger on x86
Input: joystick/analog - riscv has get_cycles()
Input: elantech - add new icbody type 15
Input: ims-pcu - fix typo in the error message

Linus Torvalds 65c64d18 313243aa

+11 -10
+1 -1
drivers/input/joystick/analog.c
··· 163 163 #define GET_TIME(x) do { x = (unsigned int)rdtsc(); } while (0) 164 164 #define DELTA(x,y) ((y)-(x)) 165 165 #define TIME_NAME "TSC" 166 - #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE) 166 + #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) || defined(CONFIG_TILE) 167 167 #define GET_TIME(x) do { x = get_cycles(); } while (0) 168 168 #define DELTA(x,y) ((y)-(x)) 169 169 #define TIME_NAME "get_cycles"
+1 -1
drivers/input/misc/ims-pcu.c
··· 1651 1651 return union_desc; 1652 1652 1653 1653 dev_err(&intf->dev, 1654 - "Union descriptor to short (%d vs %zd\n)", 1654 + "Union descriptor too short (%d vs %zd)\n", 1655 1655 union_desc->bLength, sizeof(*union_desc)); 1656 1656 return NULL; 1657 1657 }
-2
drivers/input/misc/xen-kbdfront.c
··· 326 326 0, width, 0, 0); 327 327 input_set_abs_params(mtouch, ABS_MT_POSITION_Y, 328 328 0, height, 0, 0); 329 - input_set_abs_params(mtouch, ABS_MT_PRESSURE, 330 - 0, 255, 0, 0); 331 329 332 330 ret = input_mt_init_slots(mtouch, num_cont, INPUT_MT_DIRECT); 333 331 if (ret) {
+1 -1
drivers/input/mouse/elantech.c
··· 1613 1613 case 5: 1614 1614 etd->hw_version = 3; 1615 1615 break; 1616 - case 6 ... 14: 1616 + case 6 ... 15: 1617 1617 etd->hw_version = 4; 1618 1618 break; 1619 1619 default:
+7 -3
drivers/input/touchscreen/elants_i2c.c
··· 27 27 #include <linux/module.h> 28 28 #include <linux/input.h> 29 29 #include <linux/interrupt.h> 30 + #include <linux/irq.h> 30 31 #include <linux/platform_device.h> 31 32 #include <linux/async.h> 32 33 #include <linux/i2c.h> ··· 1262 1261 } 1263 1262 1264 1263 /* 1265 - * Systems using device tree should set up interrupt via DTS, 1266 - * the rest will use the default falling edge interrupts. 1264 + * Platform code (ACPI, DTS) should normally set up interrupt 1265 + * for us, but in case it did not let's fall back to using falling 1266 + * edge to be compatible with older Chromebooks. 1267 1267 */ 1268 - irqflags = client->dev.of_node ? 0 : IRQF_TRIGGER_FALLING; 1268 + irqflags = irq_get_trigger_type(client->irq); 1269 + if (!irqflags) 1270 + irqflags = IRQF_TRIGGER_FALLING; 1269 1271 1270 1272 error = devm_request_threaded_irq(&client->dev, client->irq, 1271 1273 NULL, elants_i2c_irq,
+1 -2
drivers/input/touchscreen/hideep.c
··· 10 10 #include <linux/of.h> 11 11 #include <linux/firmware.h> 12 12 #include <linux/delay.h> 13 - #include <linux/gpio.h> 14 - #include <linux/gpio/machine.h> 13 + #include <linux/gpio/consumer.h> 15 14 #include <linux/i2c.h> 16 15 #include <linux/acpi.h> 17 16 #include <linux/interrupt.h>