Input: HID - add support for Logitech Formula Force EX

Signed-off-by: Johann Deneux <johann.deneux@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

3 files changed, 9 insertions, 2 deletions

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 2e71d3cca198..69a9f3b6d0a9 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -58,13 +58,17 @@ config HID_PID
           devices.
 
 config LOGITECH_FF
-        bool "Logitech WingMan *3D support"
+        bool "Logitech devices support"
         depends on HID_FF
         select INPUT_FF_MEMLESS if USB_HID
         help
           Say Y here if you have one of these devices:
           - Logitech WingMan Cordless RumblePad
+          - Logitech WingMan Cordless RumblePad 2
           - Logitech WingMan Force 3D
+          - Logitech Formula Force EX
+          - Logitech MOMO Force wheel
+
           and if you want to enable force feedback for them.
           Note: if you say N here, this device will still be supported, but without
           force feedback.
diff --git a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c
index bc7f8e6f8c97..e431faaa6abc 100644
--- a/drivers/usb/input/hid-ff.c
+++ b/drivers/usb/input/hid-ff.c
@@ -54,9 +54,10 @@ struct hid_ff_initializer {
 static struct hid_ff_initializer inits[] = {
 #ifdef CONFIG_LOGITECH_FF
         { 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */
+        { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */
         { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */
+        { 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */
         { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */
-        { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */
         { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */
 #endif
 #ifdef CONFIG_PANTHERLORD_FF
diff --git a/drivers/usb/input/hid-lgff.c b/drivers/usb/input/hid-lgff.c
index 4df0968f852e..d1a4dffd30f1 100644
--- a/drivers/usb/input/hid-lgff.c
+++ b/drivers/usb/input/hid-lgff.c
@@ -52,6 +52,8 @@ static const struct dev_type devices[] = {
         { 0x046d, 0xc211, ff_rumble },
         { 0x046d, 0xc219, ff_rumble },
         { 0x046d, 0xc283, ff_joystick },
+        { 0x046d, 0xc294, ff_joystick },
+        { 0x046d, 0xc295, ff_joystick },
         { 0x046d, 0xca03, ff_joystick },
         { 0x0000, 0x0000, ff_joystick }
 };