Commit f3e69428 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:

 - a fix to generate proper timestamps on key autorepeat events that
   were broken recently

 - a fix for Synaptics driver to only activate reduced reporting mode
   when explicitly requested

 - a new keycode for "selective screenshot" function

 - other assorted fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: fix stale timestamp on key autorepeat events
  Input: move the new KEY_SELECTIVE_SCREENSHOT keycode
  Input: avoid BIT() macro usage in the serio.h UAPI header
  Input: synaptics-rmi4 - set reduced reporting mode only when requested
  Input: synaptics - enable RMI on HP Envy 13-ad105ng
  Input: allocate keycode for "Selective Screenshot" key
  Input: tm2-touchkey - add support for Coreriver TC360 variant
  dt-bindings: input: add Coreriver TC360 binding
  dt-bindings: vendor-prefixes: Add Coreriver vendor prefix
  Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger()
parents 9efcc4a1 4134252a

Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
    * "cypress,tm2-touchkey" - for the touchkey found on the tm2 board

    * "cypress,midas-touchkey" - for the touchkey found on midas boards

    * "cypress,aries-touchkey" - for the touchkey found on aries boards

    * "coreriver,tc360-touchkey" - for the Coreriver TouchCore 360 touchkey

- reg: I2C address of the chip.

- interrupts: interrupt to which the chip is connected (see interrupt

	binding[0]).

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ patternProperties: 
    description: Colorful GRP, Shenzhen Xueyushi Technology Ltd.

  "^compulab,.*":

    description: CompuLab Ltd.

  "^coreriver,.*":

    description: CORERIVER Semiconductor Co.,Ltd.

  "^corpro,.*":

    description: Chengdu Corpro Technology Co., Ltd.

  "^cortina,.*":

drivers/input/input.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ static void input_repeat_key(struct timer_list *t) 
			input_value_sync

		};



		input_set_timestamp(dev, ktime_get());

		input_pass_values(dev, vals, ARRAY_SIZE(vals));



		if (dev->rep[REP_PERIOD])

drivers/input/keyboard/tm2-touchkey.c

+11 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ static struct touchkey_variant aries_touchkey_variant = { 
	.cmd_led_off = ARIES_TOUCHKEY_CMD_LED_OFF,

};



static const struct touchkey_variant tc360_touchkey_variant = {

	.keycode_reg = 0x00,

	.base_reg = 0x00,

	.fixed_regulator = true,

	.cmd_led_on = TM2_TOUCHKEY_CMD_LED_ON,

	.cmd_led_off = TM2_TOUCHKEY_CMD_LED_OFF,

};



static int tm2_touchkey_led_brightness_set(struct led_classdev *led_dev,

					    enum led_brightness brightness)

{
@@ -327,6 +335,9 @@ static const struct of_device_id tm2_touchkey_of_match[] = { 
	}, {

		.compatible = "cypress,aries-touchkey",

		.data = &aries_touchkey_variant,

	}, {

		.compatible = "coreriver,tc360-touchkey",

		.data = &tc360_touchkey_variant,

	},

	{ },

};

drivers/input/mouse/synaptics.c

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ static const char * const smbus_pnp_ids[] = { 
	"SYN3052", /* HP EliteBook 840 G4 */

	"SYN3221", /* HP 15-ay000 */

	"SYN323d", /* HP Spectre X360 13-w013dx */

	"SYN3257", /* HP Envy 13-ad105ng */

	NULL

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE