Commit 6433fe06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:

 - GT1158 ID added to Goodix touchscreen driver

 - Boeder Force Feedback Wheel USB added to iforce joystick driver

 - fixup for iforce driver to avoid hangups

 - fix autoloading of rk805-pwrkey driver.

* tag 'input-for-v6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: iforce - add support for Boeder Force Feedback Wheel
  Input: iforce - wake up after clearing IFORCE_XMIT_RUNNING flag
  Input: goodix - add compatible string for GT1158
  MAINTAINERS: add include/dt-bindings/input to INPUT DRIVERS
  Input: rk805-pwrkey - fix module autoloading
  Input: goodix - add support for GT1158
  dt-bindings: input: touchscreen: add compatible string for Goodix GT1158
parents 42cf58c2 9c9c7116

Documentation/devicetree/bindings/input/touchscreen/goodix.yaml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ properties: 
  compatible:

    enum:

      - goodix,gt1151

      - goodix,gt1158

      - goodix,gt5663

      - goodix,gt5688

      - goodix,gt911

Documentation/input/joydev/joystick.rst

+1 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ All I-Force devices are supported by the iforce module. This includes: 
* AVB Mag Turbo Force

* AVB Top Shot Pegasus

* AVB Top Shot Force Feedback Racing Wheel

* Boeder Force Feedback Wheel

* Logitech WingMan Force

* Logitech WingMan Force Wheel

* Guillemot Race Leader Force Feedback

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10032,6 +10032,7 @@ F: Documentation/devicetree/bindings/input/ 
F:	Documentation/devicetree/bindings/serio/

F:	Documentation/input/

F:	drivers/input/

F:	include/dt-bindings/input/

F:	include/linux/input.h

F:	include/linux/input/

F:	include/uapi/linux/input-event-codes.h

drivers/input/joystick/iforce/iforce-main.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static struct iforce_device iforce_device[] = { 
	{ 0x046d, 0xc291, "Logitech WingMan Formula Force",		btn_wheel, abs_wheel, ff_iforce },

	{ 0x05ef, 0x020a, "AVB Top Shot Pegasus",			btn_joystick_avb, abs_avb_pegasus, ff_iforce },

	{ 0x05ef, 0x8884, "AVB Mag Turbo Force",			btn_wheel, abs_wheel, ff_iforce },

	{ 0x05ef, 0x8886, "Boeder Force Feedback Wheel",		btn_wheel, abs_wheel, ff_iforce },

	{ 0x05ef, 0x8888, "AVB Top Shot Force Feedback Racing Wheel",	btn_wheel, abs_wheel, ff_iforce }, //?

	{ 0x061c, 0xc0a4, "ACT LABS Force RS",                          btn_wheel, abs_wheel, ff_iforce }, //?

	{ 0x061c, 0xc084, "ACT LABS Force RS",				btn_wheel, abs_wheel, ff_iforce },

drivers/input/joystick/iforce/iforce-serio.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void iforce_serio_xmit(struct iforce *iforce) 


again:

	if (iforce->xmit.head == iforce->xmit.tail) {

		clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);

		iforce_clear_xmit_and_wake(iforce);

		spin_unlock_irqrestore(&iforce->xmit_lock, flags);

		return;

	}
@@ -64,7 +64,7 @@ static void iforce_serio_xmit(struct iforce *iforce) 
	if (test_and_clear_bit(IFORCE_XMIT_AGAIN, iforce->xmit_flags))

		goto again;



	clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);

	iforce_clear_xmit_and_wake(iforce);



	spin_unlock_irqrestore(&iforce->xmit_lock, flags);

}
@@ -169,7 +169,7 @@ static irqreturn_t iforce_serio_irq(struct serio *serio, 
			iforce_serio->cmd_response_len = iforce_serio->len;



			/* Signal that command is done */

			wake_up(&iforce->wait);

			wake_up_all(&iforce->wait);

		} else if (likely(iforce->type)) {

			iforce_process_packet(iforce, iforce_serio->id,

					      iforce_serio->data_in,