USB: option: add a bunch of new device ids

This adds all of the known Option device ids to the driver.
Many thanks to some Option engineers for getting me this list.

Cc: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 80 insertions, 20 deletions

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 43be23a24575..db92a7fb1f7c 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -67,29 +67,89 @@ static int  option_tiocmset(struct usb_serial_port *port, struct file *file,
 static int  option_send_setup(struct usb_serial_port *port);
 
 /* Vendor and product IDs */
-#define OPTION_VENDOR_ID                0x0AF0
-#define HUAWEI_VENDOR_ID                0x12D1
-#define NOVATELWIRELESS_VENDOR_ID       0x1410
-#define ANYDATA_VENDOR_ID               0x16d5
-
-#define OPTION_PRODUCT_OLD              0x5000
-#define OPTION_PRODUCT_FUSION           0x6000
-#define OPTION_PRODUCT_FUSION2          0x6300
-#define OPTION_PRODUCT_COBRA            0x6500
-#define OPTION_PRODUCT_COBRA2           0x6600
-#define OPTION_PRODUCT_GTMAX36          0x6701
-#define HUAWEI_PRODUCT_E600             0x1001
-#define HUAWEI_PRODUCT_E220             0x1003
-#define NOVATELWIRELESS_PRODUCT_U740    0x1400
-#define ANYDATA_PRODUCT_ID              0x6501
+#define OPTION_VENDOR_ID                        0x0AF0
+#define OPTION_PRODUCT_COLT                     0x5000
+#define OPTION_PRODUCT_RICOLA                   0x6000
+#define OPTION_PRODUCT_RICOLA_LIGHT             0x6100
+#define OPTION_PRODUCT_RICOLA_QUAD              0x6200
+#define OPTION_PRODUCT_RICOLA_QUAD_LIGHT        0x6300
+#define OPTION_PRODUCT_RICOLA_NDIS              0x6050
+#define OPTION_PRODUCT_RICOLA_NDIS_LIGHT        0x6150
+#define OPTION_PRODUCT_RICOLA_NDIS_QUAD         0x6250
+#define OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT   0x6350
+#define OPTION_PRODUCT_COBRA                    0x6500
+#define OPTION_PRODUCT_COBRA_BUS                0x6501
+#define OPTION_PRODUCT_VIPER                    0x6600
+#define OPTION_PRODUCT_VIPER_BUS                0x6601
+#define OPTION_PRODUCT_GT_MAX_READY             0x6701
+#define OPTION_PRODUCT_GT_MAX                   0x6711
+#define OPTION_PRODUCT_FUJI_MODEM_LIGHT         0x6721
+#define OPTION_PRODUCT_FUJI_MODEM_GT            0x6741
+#define OPTION_PRODUCT_FUJI_MODEM_EX            0x6761
+#define OPTION_PRODUCT_FUJI_NETWORK_LIGHT       0x6731
+#define OPTION_PRODUCT_FUJI_NETWORK_GT          0x6751
+#define OPTION_PRODUCT_FUJI_NETWORK_EX          0x6771
+#define OPTION_PRODUCT_KOI_MODEM                0x6800
+#define OPTION_PRODUCT_KOI_NETWORK              0x6811
+#define OPTION_PRODUCT_SCORPION_MODEM           0x6901
+#define OPTION_PRODUCT_SCORPION_NETWORK         0x6911
+#define OPTION_PRODUCT_ETNA_MODEM               0x7001
+#define OPTION_PRODUCT_ETNA_NETWORK             0x7011
+#define OPTION_PRODUCT_ETNA_MODEM_LITE          0x7021
+#define OPTION_PRODUCT_ETNA_MODEM_GT            0x7041
+#define OPTION_PRODUCT_ETNA_MODEM_EX            0x7061
+#define OPTION_PRODUCT_ETNA_NETWORK_LITE        0x7031
+#define OPTION_PRODUCT_ETNA_NETWORK_GT          0x7051
+#define OPTION_PRODUCT_ETNA_NETWORK_EX          0x7071
+#define OPTION_PRODUCT_ETNA_KOI_MODEM           0x7100
+#define OPTION_PRODUCT_ETNA_KOI_NETWORK         0x7111
+
+#define HUAWEI_VENDOR_ID                        0x12D1
+#define HUAWEI_PRODUCT_E600                     0x1001
+#define HUAWEI_PRODUCT_E220                     0x1003
+
+#define NOVATELWIRELESS_VENDOR_ID               0x1410
+#define NOVATELWIRELESS_PRODUCT_U740            0x1400
+
+#define ANYDATA_VENDOR_ID                       0x16d5
+#define ANYDATA_PRODUCT_ID                      0x6501
 
 static struct usb_device_id option_ids[] = {
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTMAX36) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA_BUS) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_NETWORK) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_NETWORK) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_LITE) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },