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)

diff --combined drivers/hid/Kconfig
index 11a0c7c40c298ed7166626c5cec438d3ed04bde4,c4308d4988dc065b6557fa49231d348bda4f4a61..b2ab14d27640fcf31139df231335edebe20247c0
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -28,6 -28,7 +28,6 @@@ if HI
  
  config HID_BATTERY_STRENGTH
        bool "Battery level reporting for HID devices"
 -      depends on HID
        select POWER_SUPPLY
        default n
        help
@@@ -37,6 -38,7 +37,6 @@@
  
  config HIDRAW
        bool "/dev/hidraw raw HID device support"
 -      depends on HID
        help
        Say Y here if you want to support HID devices (from the USB
        specification standpoint) that aren't strictly user interface
@@@ -55,6 -57,7 +55,6 @@@
  
  config UHID
        tristate "User-space I/O driver support for HID subsystem"
 -      depends on HID
        default n
        help
        Say Y here if you want to provide HID I/O Drivers from user-space.
@@@ -75,6 -78,7 +75,6 @@@
  
  config HID_GENERIC
        tristate "Generic HID driver"
 -      depends on HID
        default HID
        help
        Support for generic devices on the HID bus. This includes most
@@@ -86,9 -90,11 +86,9 @@@
        If unsure, say Y.
  
  menu "Special HID drivers"
 -      depends on HID
  
  config HID_A4TECH
        tristate "A4TECH mice"
 -      depends on HID
        default !EXPERT
        help
        Support for some A4TECH mice with two scroll wheels.
@@@ -107,6 -113,7 +107,6 @@@ config HID_ACCUTOUC
  
  config HID_ACRUX
        tristate "ACRUX game controller support"
 -      depends on HID
        help
        Say Y here if you want to enable support for ACRUX game controllers.
  
@@@ -120,6 -127,7 +120,6 @@@ config HID_ACRUX_F
  
  config HID_APPLE
        tristate "Apple {i,Power,Mac}Books"
 -      depends on HID
        depends on LEDS_CLASS
        depends on NEW_LEDS
        default !EXPERT
@@@ -159,11 -167,13 +159,11 @@@ config HID_ASU
  
  config HID_AUREAL
        tristate "Aureal"
 -      depends on HID
        help
        Support for Aureal Cy se W-01RN Remote Controller and other Aureal derived remotes.
  
  config HID_BELKIN
        tristate "Belkin Flip KVM and Wireless keyboard"
 -      depends on HID
        default !EXPERT
        help
        Support for Belkin Flip KVM and Wireless keyboard.
@@@ -192,6 -202,7 +192,6 @@@ config HID_BIGBEN_F
  
  config HID_CHERRY
        tristate "Cherry Cymotion keyboard"
 -      depends on HID
        default !EXPERT
        help
        Support for Cherry Cymotion keyboard.
@@@ -216,6 -227,7 +216,6 @@@ config HID_CORSAI
  
  config HID_COUGAR
        tristate "Cougar devices"
 -      depends on HID
        help
        Support for Cougar devices that are not fully compliant with the
        HID standard.
@@@ -225,6 -237,7 +225,6 @@@
  
  config HID_MACALLY
        tristate "Macally devices"
 -      depends on HID
        help
        Support for Macally devices that are not fully compliant with the
        HID standard.
@@@ -249,6 -262,7 +249,6 @@@ config HID_PRODIKEY
  
  config HID_CMEDIA
        tristate "CMedia audio chips"
 -      depends on HID
        help
        Support for CMedia CM6533 HID audio jack controls
          and HS100B mute buttons.
@@@ -274,12 -288,14 +274,12 @@@ config HID_CREATIVE_SB054
  
  config HID_CYPRESS
        tristate "Cypress mouse and barcode readers"
 -      depends on HID
        default !EXPERT
        help
        Support for cypress mouse and barcode readers.
  
  config HID_DRAGONRISE
        tristate "DragonRise Inc. game controller"
 -      depends on HID
        help
        Say Y here if you have DragonRise Inc. game controllers.
        These might be branded as:
@@@ -298,6 -314,7 +298,6 @@@ config DRAGONRISE_F
  
  config HID_EMS_FF
        tristate "EMS Production Inc. force feedback support"
 -      depends on HID
        select INPUT_FF_MEMLESS
        help
        Say Y here if you want to enable force feedback support for devices by
@@@ -315,6 -332,7 +315,6 @@@ config HID_ELA
  
  config HID_ELECOM
        tristate "ELECOM HID devices"
 -      depends on HID
        help
        Support for ELECOM devices:
          - BM084 Bluetooth Mouse
@@@ -331,6 -349,7 +331,6 @@@ config HID_EL
  
  config HID_EZKEY
        tristate "Ezkey BTC 8193 keyboard"
 -      depends on HID
        default !EXPERT
        help
        Support for Ezkey BTC 8193 keyboard.
@@@ -348,16 -367,19 +348,16 @@@ config HID_FT26
  
  config HID_GEMBIRD
        tristate "Gembird Joypad"
 -      depends on HID
        help
        Support for Gembird JPD-DualForce 2.
  
  config HID_GFRM
        tristate "Google Fiber TV Box remote control support"
 -      depends on HID
        help
        Support for Google Fiber TV Box remote controls
  
  config HID_GLORIOUS
        tristate "Glorious PC Gaming Race mice"
 -      depends on HID
        help
          Support for Glorious PC Gaming Race mice such as
          the Glorious Model O, O- and D.
@@@ -402,6 -424,7 +402,6 @@@ config HID_VIVALD
        tristate "Vivaldi Keyboard"
        select HID_VIVALDI_COMMON
        select INPUT_VIVALDIFMAP
 -      depends on HID
        help
          Say Y here if you want to enable support for Vivaldi keyboards.
  
@@@ -424,6 -447,7 +424,6 @@@ config HID_GT683
  
  config HID_KEYTOUCH
        tristate "Keytouch HID devices"
 -      depends on HID
        help
        Support for Keytouch HID devices not fully compliant with
        the specification. Currently supported:
@@@ -431,6 -455,7 +431,6 @@@
  
  config HID_KYE
        tristate "KYE/Genius devices"
 -      depends on HID
        help
        Support for KYE/Genius devices not fully compliant with HID standard:
        - Ergo Mouse
@@@ -446,27 -471,32 +446,27 @@@ config HID_UCLOGI
  
  config HID_WALTOP
        tristate "Waltop"
 -      depends on HID
        help
        Support for Waltop tablets.
  
  config HID_VIEWSONIC
        tristate "ViewSonic/Signotec"
 -      depends on HID
        help
          Support for ViewSonic/Signotec PD1011 signature pad.
  
  config HID_XIAOMI
        tristate "Xiaomi"
 -      depends on HID
        help
          Adds support for side buttons of Xiaomi Mi Dual Mode Wireless
          Mouse Silent Edition.
  
  config HID_GYRATION
        tristate "Gyration remote control"
 -      depends on HID
        help
        Support for Gyration remote control.
  
  config HID_ICADE
        tristate "ION iCade arcade controller"
 -      depends on HID
        help
        Support for the ION iCade arcade controller to work as a joystick.
  
@@@ -475,12 -505,14 +475,12 @@@
  
  config HID_ITE
        tristate "ITE devices"
 -      depends on HID
        default !EXPERT
        help
        Support for ITE devices not fully compliant with HID standard.
  
  config HID_JABRA
        tristate "Jabra USB HID Driver"
 -      depends on HID
        help
        Support for Jabra USB HID devices.
  
@@@ -491,22 -523,26 +491,22 @@@
  
  config HID_TWINHAN
        tristate "Twinhan IR remote control"
 -      depends on HID
        help
        Support for Twinhan IR remote control.
  
  config HID_KENSINGTON
        tristate "Kensington Slimblade Trackball"
 -      depends on HID
        default !EXPERT
        help
        Support for Kensington Slimblade Trackball.
  
  config HID_LCPOWER
        tristate "LC-Power"
 -      depends on HID
        help
        Support for LC-Power RC1000MCE RF remote control.
  
  config HID_LED
        tristate "Simple RGB LED support"
 -      depends on HID
        depends on LEDS_CLASS
        help
        Support for simple RGB LED devices. Currently supported are:
@@@ -521,6 -557,7 +521,6 @@@
  
  config HID_LENOVO
        tristate "Lenovo / Thinkpad devices"
 -      depends on HID
        select NEW_LEDS
        select LEDS_CLASS
        help
@@@ -638,6 -675,7 +638,6 @@@ config LOGIWHEELS_F
  
  config HID_MAGICMOUSE
        tristate "Apple Magic Mouse/Trackpad multi-touch support"
 -      depends on HID
        help
        Support for the Apple Magic Mouse/Trackpad multi-touch.
  
@@@ -646,12 -684,14 +646,12 @@@
  
  config HID_MALTRON
        tristate "Maltron L90 keyboard"
 -      depends on HID
        help
        Adds support for the volume up, volume down, mute, and play/pause buttons
        of the Maltron L90 keyboard.
  
  config HID_MAYFLASH
        tristate "Mayflash game controller adapter force feedback"
 -      depends on HID
        select INPUT_FF_MEMLESS
        help
        Say Y here if you have HJZ Mayflash PS3 game controller adapters
@@@ -667,12 -707,14 +667,12 @@@ config HID_MEGAWORLD_F
  
  config HID_REDRAGON
        tristate "Redragon keyboards"
 -      depends on HID
        default !EXPERT
        help
      Support for Redragon keyboards that need fix-ups to work properly.
  
  config HID_MICROSOFT
        tristate "Microsoft non-fully HID-compliant devices"
 -      depends on HID
        default !EXPERT
        select INPUT_FF_MEMLESS
        help
@@@ -680,12 -722,14 +680,12 @@@
  
  config HID_MONTEREY
        tristate "Monterey Genius KB29E keyboard"
 -      depends on HID
        default !EXPERT
        help
        Support for Monterey Genius KB29E.
  
  config HID_MULTITOUCH
        tristate "HID Multitouch panels"
 -      depends on HID
        help
          Generic support for HID multitouch panels.
  
@@@ -731,6 -775,7 +731,6 @@@
  
  config HID_NINTENDO
        tristate "Nintendo Joy-Con and Pro Controller support"
 -      depends on HID
        depends on NEW_LEDS
        depends on LEDS_CLASS
        select POWER_SUPPLY
@@@ -766,6 -811,7 +766,6 @@@ config HID_NTRI
  
  config HID_ORTEK
        tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad"
 -      depends on HID
        help
        There are certain devices which have LogicalMaximum wrong in the keyboard
        usage page of their report descriptor. The most prevailing ones so far
@@@ -778,6 -824,7 +778,6 @@@
  
  config HID_PANTHERLORD
        tristate "Pantherlord/GreenAsia game controller"
 -      depends on HID
        help
          Say Y here if you have a PantherLord/GreenAsia based game controller
          or adapter.
@@@ -803,11 -850,13 +803,11 @@@ config HID_PENMOUN
  
  config HID_PETALYNX
        tristate "Petalynx Maxter remote control"
 -      depends on HID
        help
        Support for Petalynx Maxter remote control.
  
  config HID_PICOLCD
        tristate "PicoLCD (graphic version)"
 -      depends on HID
        help
          This provides support for Minibox PicoLCD devices, currently
          only the graphical ones are supported.
@@@ -873,6 -922,7 +873,6 @@@ config HID_PICOLCD_CI
  
  config HID_PLANTRONICS
        tristate "Plantronics USB HID Driver"
 -      depends on HID
        help
          Provides HID support for Plantronics USB audio devices.
          Correctly maps vendor unique volume up/down HID usages to
@@@ -883,6 -933,7 +883,6 @@@
  
  config HID_PLAYSTATION
        tristate "PlayStation HID Driver"
 -      depends on HID
        depends on LEDS_CLASS_MULTICOLOR
        select CRC32
        select POWER_SUPPLY
@@@ -901,12 -952,14 +901,12 @@@ config PLAYSTATION_F
  
  config HID_RAZER
        tristate "Razer non-fully HID-compliant devices"
 -      depends on HID
        help
        Support for Razer devices that are not fully compliant with the
        HID standard.
  
  config HID_PRIMAX
        tristate "Primax non-fully HID-compliant devices"
 -      depends on HID
        help
        Support for Primax devices that are not fully compliant with the
        HID standard.
@@@ -928,6 -981,7 +928,6 @@@ config HID_ROCCA
  
  config HID_SAITEK
        tristate "Saitek (Mad Catz) non-fully HID-compliant devices"
 -      depends on HID
        help
        Support for Saitek devices that are not fully compliant with the
        HID standard.
@@@ -945,6 -999,7 +945,6 @@@ config HID_SAMSUN
  
  config HID_SEMITEK
        tristate "Semitek USB keyboards"
 -      depends on HID
        help
        Support for Semitek USB keyboards that are not fully compliant
        with the HID standard.
@@@ -995,11 -1050,13 +995,11 @@@ config SONY_F
  
  config HID_SPEEDLINK
        tristate "Speedlink VAD Cezanne mouse support"
 -      depends on HID
        help
        Support for Speedlink Vicious and Divine Cezanne mouse.
  
  config HID_STEAM
        tristate "Steam Controller support"
 -      depends on HID
        select POWER_SUPPLY
        help
        Say Y here if you have a Steam Controller if you want to use it
@@@ -1008,16 -1065,19 +1008,16 @@@
  
  config HID_STEELSERIES
        tristate "Steelseries SRW-S1 steering wheel support"
 -      depends on HID
        help
        Support for Steelseries SRW-S1 steering wheel
  
  config HID_SUNPLUS
        tristate "Sunplus wireless desktop"
 -      depends on HID
        help
        Support for Sunplus wireless desktop.
  
  config HID_RMI
        tristate "Synaptics RMI4 device support"
 -      depends on HID
        select RMI4_CORE
        select RMI4_F03
        select RMI4_F11
@@@ -1030,6 -1090,7 +1030,6 @@@
  
  config HID_GREENASIA
        tristate "GreenAsia (Product ID 0x12) game controller support"
 -      depends on HID
        help
          Say Y here if you have a GreenAsia (Product ID 0x12) based game
          controller or adapter.
@@@ -1051,6 -1112,7 +1051,6 @@@ config HID_HYPERV_MOUS
  
  config HID_SMARTJOYPLUS
        tristate "SmartJoy PLUS PS2/USB adapter support"
 -      depends on HID
        help
        Support for SmartJoy PLUS PS2/USB adapter, Super Dual Box,
        Super Joy Box 3 Pro, Super Dual Box Pro, and Super Joy Box 5 Pro.
@@@ -1068,17 -1130,26 +1068,23 @@@ config SMARTJOYPLUS_F
  
  config HID_TIVO
        tristate "TiVo Slide Bluetooth remote control support"
 -      depends on HID
        help
        Say Y if you have a TiVo Slide Bluetooth remote control.
  
  config HID_TOPSEED
        tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"
 -      depends on HID
        help
        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
@@@ -1105,6 -1176,7 +1111,6 @@@ config THRUSTMASTER_F
  
  config HID_UDRAW_PS3
        tristate "THQ PS3 uDraw tablet"
 -      depends on HID
        help
          Say Y here if you want to use the THQ uDraw gaming tablet for
          the PS3.
@@@ -1141,6 -1213,7 +1147,6 @@@ config HID_WACO
  
  config HID_WIIMOTE
        tristate "Nintendo Wii / Wii U peripherals"
 -      depends on HID
        depends on LEDS_CLASS
        select POWER_SUPPLY
        select INPUT_FF_MEMLESS
@@@ -1165,6 -1238,7 +1171,6 @@@
  
  config HID_XINMO
        tristate "Xin-Mo non-fully compliant devices"
 -      depends on HID
        help
        Support for Xin-Mo devices that are not fully compliant with the HID
        standard. Currently only supports the Xin-Mo Dual Arcade. Say Y here
@@@ -1172,6 -1246,7 +1178,6 @@@
  
  config HID_ZEROPLUS
        tristate "Zeroplus based game controller support"
 -      depends on HID
        help
          Say Y here if you have a Zeroplus based game controller.
  
@@@ -1185,12 -1260,13 +1191,12 @@@ config ZEROPLUS_F
  
  config HID_ZYDACRON
        tristate "Zydacron remote control support"
 -      depends on HID
        help
        Support for Zydacron remote control.
  
  config HID_SENSOR_HUB
        tristate "HID Sensors framework support"
 -      depends on HID && HAS_IOMEM
 +      depends on HAS_IOMEM
        select MFD_CORE
        default n
        help
@@@ -1219,6 -1295,7 +1225,6 @@@ config HID_SENSOR_CUSTOM_SENSO
  
  config HID_ALPS
        tristate "Alps HID device support"
 -      depends on HID
        help
        Support for Alps I2C HID touchpads and StickPointer.
        Say Y here if you have a Alps touchpads over i2c-hid or usbhid