From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Wed, 5 Oct 2022 09:30:18 +0000 (+0100)
Subject: Merge branch 'for-6.1/topre' into for-linus
X-Git-Tag: v6.1-rc5~278^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0400ff2942a71b7cde2107786084ac38126519c;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-6.1/topre' into for-linus

- Fix Topre REALFORCE R2 keyboard so it can send more than 6 keys at the
  time (Harry Stern)
---

b0400ff2942a71b7cde2107786084ac38126519c
diff --cc drivers/hid/Kconfig
index 11a0c7c40c29,c4308d4988dc..b2ab14d27640
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -1077,8 -1141,15 +1077,14 @@@ config HID_TOPSEE
  	Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
  	CLLRCMCE remote control.
  
+ config HID_TOPRE
+ 	tristate "Topre REALFORCE keyboards"
+ 	depends on HID
+ 	help
+ 	  Say Y for N-key rollover support on Topre REALFORCE R2 108 key keyboards.
+ 
  config HID_THINGM
  	tristate "ThingM blink(1) USB RGB LED"
 -	depends on HID
  	depends on LEDS_CLASS
  	select HID_LED
  	help