Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c64d18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 313243aa 02a0d921

drivers/input/joystick/analog.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static unsigned int get_time_pit(void) 
#define GET_TIME(x)	do { x = (unsigned int)rdtsc(); } while (0)

#define DELTA(x,y)	((y)-(x))

#define TIME_NAME	"TSC"

#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE)

#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) || defined(CONFIG_TILE)

#define GET_TIME(x)	do { x = get_cycles(); } while (0)

#define DELTA(x,y)	((y)-(x))

#define TIME_NAME	"get_cycles"

drivers/input/misc/ims-pcu.c

+1 −1
Original line number Diff line number Diff line
@@ -1651,7 +1651,7 @@ ims_pcu_get_cdc_union_desc(struct usb_interface *intf) 
				return union_desc;



			dev_err(&intf->dev,

				"Union descriptor to short (%d vs %zd\n)",

				"Union descriptor too short (%d vs %zd)\n",

				union_desc->bLength, sizeof(*union_desc));

			return NULL;

		}

drivers/input/misc/xen-kbdfront.c

+0 −2
Original line number Diff line number Diff line
@@ -326,8 +326,6 @@ static int xenkbd_probe(struct xenbus_device *dev, 
				     0, width, 0, 0);

		input_set_abs_params(mtouch, ABS_MT_POSITION_Y,

				     0, height, 0, 0);

		input_set_abs_params(mtouch, ABS_MT_PRESSURE,

				     0, 255, 0, 0);



		ret = input_mt_init_slots(mtouch, num_cont, INPUT_MT_DIRECT);

		if (ret) {

drivers/input/mouse/elantech.c

+1 −1
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ static int elantech_set_properties(struct elantech_data *etd) 
		case 5:

			etd->hw_version = 3;

			break;

		case 6 ... 14:

		case 6 ... 15:

			etd->hw_version = 4;

			break;

		default:

drivers/input/touchscreen/elants_i2c.c

+7 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/module.h>

#include <linux/input.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/async.h>

#include <linux/i2c.h>
@@ -1261,10 +1262,13 @@ static int elants_i2c_probe(struct i2c_client *client, 
	}



	/*

	 * Systems using device tree should set up interrupt via DTS,

	 * the rest will use the default falling edge interrupts.

	 * Platform code (ACPI, DTS) should normally set up interrupt

	 * for us, but in case it did not let's fall back to using falling

	 * edge to be compatible with older Chromebooks.

	 */

	irqflags = client->dev.of_node ? 0 : IRQF_TRIGGER_FALLING;

	irqflags = irq_get_trigger_type(client->irq);

	if (!irqflags)

		irqflags = IRQF_TRIGGER_FALLING;



	error = devm_request_threaded_irq(&client->dev, client->irq,

					  NULL, elants_i2c_irq,