4 files changed, 20 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 230b6f887cd8..c33d98e00dce 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -146,6 +146,16 @@ config HID_BELKIN
         ---help---
         Support for Belkin Flip KVM and Wireless keyboard.
 
+config HID_BETOP_FF
+        tristate "Betop Production Inc. force feedback support"
+        depends on USB_HID
+        select INPUT_FF_MEMLESS
+        ---help---
+        Say Y here if you want to enable force feedback support for devices by
+        BETOP Production Ltd.
+        Currently the following devices are known to be supported:
+         - BETOP 2185 PC & BFM MODE
+
 config HID_CHERRY
         tristate "Cherry Cymotion keyboard" if EXPERT
         depends on HID
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index debd15b44b59..3a27d14be28d 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_HID_APPLE)		+= hid-apple.o
 obj-$(CONFIG_HID_APPLEIR)       += hid-appleir.o
 obj-$(CONFIG_HID_AUREAL)        += hid-aureal.o
 obj-$(CONFIG_HID_BELKIN)        += hid-belkin.o
+obj-$(CONFIG_HID_BETOP_FF)      += hid-betopff.o
 obj-$(CONFIG_HID_CHERRY)        += hid-cherry.o
 obj-$(CONFIG_HID_CHICONY)       += hid-chicony.o
 obj-$(CONFIG_HID_CP2112)        += hid-cp2112.o
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c3d0ac1a0988..9b1442ac4002 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1757,6 +1757,10 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185BFM, 0x2208) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185PC, 0x5506) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185V2PC, 0x1850) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185V2BFM, 0x5500) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7460f3402298..ac20ba0937ce 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -189,6 +189,11 @@
 #define USB_VENDOR_ID_BERKSHIRE         0x0c98
 #define USB_DEVICE_ID_BERKSHIRE_PCWD    0x1140
 
+#define USB_VENDOR_ID_BETOP_2185BFM     0x11c2
+#define USB_VENDOR_ID_BETOP_2185PC      0x11c0
+#define USB_VENDOR_ID_BETOP_2185V2PC    0x8380
+#define USB_VENDOR_ID_BETOP_2185V2BFM   0x20bc
+
 #define USB_VENDOR_ID_BTC               0x046e
 #define USB_DEVICE_ID_BTC_EMPREX_REMOTE 0x5578
 #define USB_DEVICE_ID_BTC_EMPREX_REMOTE_2       0x5577