From: xxh <xxh@rock-chips.com>
Date: Thu, 28 Mar 2013 07:42:20 +0000 (+0800)
Subject: add some vid pid for Foreign 3G dongle
X-Git-Tag: firefly_0821_release~7322
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a0bbfb1935edb0c568eb9677a6941bde9d03e96a;p=firefly-linux-kernel-4.4.55.git

add some vid pid for Foreign 3G dongle
---

diff --git a/drivers/base/devices_filter.h b/drivers/base/devices_filter.h
index cb8b72c4896f..e488496b53c9 100644
--- a/drivers/base/devices_filter.h
+++ b/drivers/base/devices_filter.h
@@ -44,7 +44,8 @@ static usb_parameter skip_device_list[] = {
 	{0x19D2, 0x0017, NULL, NULL, NULL},
 	{0x19D2, 0x0015, NULL, NULL, NULL},
         {0x19D2, 0x0154, NULL, NULL, NULL},        
-        {0x19D2, 0x2003, NULL, NULL, NULL},         
+        {0x19D2, 0x2003, NULL, NULL, NULL},
+		{0x19D2, 0x0151, NULL, NULL, NULL},         
 	{0x04CC, 0x225A, NULL, NULL, NULL},
 	{0x04CC, 0x2259, NULL, NULL, NULL},
 
@@ -70,6 +71,8 @@ static usb_parameter skip_device_list[] = {
 	{0x1C9E, 0x6000, NULL, NULL, NULL},
 	{0x1C9E, 0x1001, NULL, NULL, NULL},
 	
+	{0x1C9E, 0xF000, NULL, NULL, NULL},    
+    {0x1C9E, 0x9605, NULL, NULL, NULL},	
 	{0x21F5, 0x2008, NULL, NULL, NULL},
 	{0x21F5, 0x1000, NULL, NULL, NULL},
 	
@@ -79,14 +82,28 @@ static usb_parameter skip_device_list[] = {
 
 //	{0x20A6, 0xF00E, NULL, NULL, NULL},
 	{0x1614, 0x0800, NULL, NULL, NULL},
+	//begain add by xxh
         {0x1A8D, 0x2000, NULL, NULL, NULL},
         {0x1C9E, 0x9913, NULL, NULL, NULL},
         {0x1C9E, 0x9915, NULL, NULL, NULL},
         {0x230D, 0x000C, NULL, NULL, NULL},
         {0x230D, 0x0003, NULL, NULL, NULL},
+		{0x230D, 0x0001, NULL, NULL, NULL},
         {0x257A, 0x2601, NULL, NULL, NULL},
         {0x1E89, 0x1E16, NULL, NULL, NULL},
-        {0x1C9E, 0x9800, NULL, NULL, NULL}, 
+        {0x1C9E, 0x9800, NULL, NULL, NULL},
+		{0x1dbc, 0x0669, NULL, NULL, NULL},  
+		{0x2020, 0x0002, NULL, NULL, NULL},    
+		{0x2020, 0x4000, NULL, NULL, NULL},  
+	    {0x1C9E, 0x9916, NULL, NULL, NULL},     
+		{0x1C9E, 0x9918, NULL, NULL, NULL},     
+	    {0x2001, 0xA80B, NULL, NULL, NULL},      
+	    {0x2001, 0x7D00, NULL, NULL, NULL},   
+		{0x0421, 0x0610, NULL, NULL, NULL},    
+        {0x0af0, 0xd157, NULL, NULL, NULL},      
+	    {0x19d2, 0x1216, NULL, NULL, NULL},         
+		{0x19d2, 0x1218, NULL, NULL, NULL},
+   //end xxh		 
 };
 
 /* 1 - match
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 74be8d109d70..4357cba701d4 100755
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -476,6 +476,11 @@ static void option_instat_callback(struct urb *urb);
 /* Changhong products */
 #define CHANGHONG_VENDOR_ID			0x2077
 #define CHANGHONG_PRODUCT_CH690			0x7001
+/* Strong Rising WCDMA modem*/
+#define STRONG_RISING_VENDOR_ID     0x21F5
+#define STRONG_RISING_PRODUCT_SPW9S  0x2012
+/* Strong Rising EVDO modem*/
+#define STRONG_RISING_PRODUCT_SP8J  0x2009
 
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
@@ -1340,7 +1345,9 @@ static const struct usb_device_id option_ids[] = {
    { USB_DEVICE(0x19d2, 0xffe8) },
    { USB_DEVICE(0x19D2,0x1177) },//K3770-Z
    { USB_DEVICE(0x230D, 0x000c) },
-   { USB_DEVICE(0x21F5, 0x2009) },
+ //  { USB_DEVICE(0x21F5, 0x2009) },
+   {USB_DEVICE(STRONG_RISING_VENDOR_ID,STRONG_RISING_PRODUCT_SP8J)},
+   {USB_DEVICE(STRONG_RISING_VENDOR_ID,STRONG_RISING_PRODUCT_SPW9S)},
    { USB_DEVICE(0x15eb,0x0001)},
    { USB_DEVICE(0x12d1,0x14db) },
    { USB_DEVICE(0x15EB,0x7152)},
@@ -1350,9 +1357,17 @@ static const struct usb_device_id option_ids[] = {
    { USB_DEVICE(0x1C9E,0x9915)},
    { USB_DEVICE(0x1C9E,0x9800)},
    { USB_DEVICE(0x05c6,0x0016)},
+   { USB_DEVICE(0x0B3C,0xC00A)},
+   { USB_DEVICE(0x230D, 0x0103)},
+   { USB_DEVICE(0x1DBC,0x0669)},
+   { USB_DEVICE(0x2020,0x4000)},
    { USB_DEVICE(0x230D, 0x0003)},
    { USB_DEVICE(0x230D, 0x000C)},
    { USB_DEVICE(0x12d1,0x1506)},
+   { USB_DEVICE(0x2001,0x7D00)},//D-Link DWM-156
+   { USB_DEVICE(0x0af0,0xd157)}, 
+   { USB_DEVICE(0x0421,0x0612)},
+   { USB_DEVICE(0x19d2,0x1218)},
 //xxh end