From: Greg Kroah-Hartman Date: Tue, 5 Feb 2013 22:08:47 +0000 (-0800) Subject: 3.0-stable patches X-Git-Tag: v3.0.63~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1918da74201df8b3af511073f908128158959154;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: usb-ftdi_sio-add-pid-vid-entries-for-elv-ws-300-pc-ii.patch usb-ftdi_sio-add-zolix-ftdi-pid.patch usb-option-add-changhong-ch690.patch usb-option-add-support-for-telit-le920.patch usb-qcserial-add-telit-gobi-qdl-device.patch --- diff --git a/queue-3.0/series b/queue-3.0/series index d37ed8b83f3..330aa2843f2 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -4,3 +4,8 @@ drm-radeon-calling-object_unrefer-when-creating-fb-failure.patch x86-64-replace-left-over-sti-cli-in-ia32-audit-exit-code.patch nilfs2-fix-fix-very-long-mount-time-issue.patch drivers-rtc-rtc-isl1208.c-call-rtc_update_irq-from-the-alarm-irq-handler.patch +usb-ftdi_sio-add-zolix-ftdi-pid.patch +usb-ftdi_sio-add-pid-vid-entries-for-elv-ws-300-pc-ii.patch +usb-option-add-support-for-telit-le920.patch +usb-option-add-changhong-ch690.patch +usb-qcserial-add-telit-gobi-qdl-device.patch diff --git a/queue-3.0/usb-ftdi_sio-add-pid-vid-entries-for-elv-ws-300-pc-ii.patch b/queue-3.0/usb-ftdi_sio-add-pid-vid-entries-for-elv-ws-300-pc-ii.patch new file mode 100644 index 00000000000..d1b82e08070 --- /dev/null +++ b/queue-3.0/usb-ftdi_sio-add-pid-vid-entries-for-elv-ws-300-pc-ii.patch @@ -0,0 +1,49 @@ +From c249f911406efcc7456cb4af79396726bf7b8c57 Mon Sep 17 00:00:00 2001 +From: Sven Killig +Date: Fri, 1 Feb 2013 23:43:06 +0100 +Subject: USB: ftdi_sio: add PID/VID entries for ELV WS 300 PC II + +From: Sven Killig + +commit c249f911406efcc7456cb4af79396726bf7b8c57 upstream. + +Add PID/VID entries for ELV WS 300 PC II weather station + +Signed-off-by: Sven Killig +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -588,6 +588,7 @@ static struct usb_device_id id_table_com + /* + * ELV devices: + */ ++ { USB_DEVICE(FTDI_ELV_VID, FTDI_ELV_WS300_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_ELV_USR_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_ELV_MSM1_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_ELV_KL100_PID) }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -209,7 +209,7 @@ + + /* + * ELV USB devices submitted by Christian Abt of ELV (www.elv.de). +- * All of these devices use FTDI's vendor ID (0x0403). ++ * Almost all of these devices use FTDI's vendor ID (0x0403). + * Further IDs taken from ELV Windows .inf file. + * + * The previously included PID for the UO 100 module was incorrect. +@@ -217,6 +217,8 @@ + * + * Armin Laeuger originally sent the PID for the UM 100 module. + */ ++#define FTDI_ELV_VID 0x1B1F /* ELV AG */ ++#define FTDI_ELV_WS300_PID 0xC006 /* eQ3 WS 300 PC II */ + #define FTDI_ELV_USR_PID 0xE000 /* ELV Universal-Sound-Recorder */ + #define FTDI_ELV_MSM1_PID 0xE001 /* ELV Mini-Sound-Modul */ + #define FTDI_ELV_KL100_PID 0xE002 /* ELV Kfz-Leistungsmesser KL 100 */ diff --git a/queue-3.0/usb-ftdi_sio-add-zolix-ftdi-pid.patch b/queue-3.0/usb-ftdi_sio-add-zolix-ftdi-pid.patch new file mode 100644 index 00000000000..c08e37b76fb --- /dev/null +++ b/queue-3.0/usb-ftdi_sio-add-zolix-ftdi-pid.patch @@ -0,0 +1,43 @@ +From 0ba3b2ccc72b3df5c305d61f59d93ab0f0e87991 Mon Sep 17 00:00:00 2001 +From: Petr Kubánek +Date: Fri, 1 Feb 2013 17:24:04 +0100 +Subject: USB: ftdi_sio: add Zolix FTDI PID + +From: Petr Kubánek + +commit 0ba3b2ccc72b3df5c305d61f59d93ab0f0e87991 upstream. + +Add support for Zolix Omni 1509 monochromator custom USB-RS232 converter. + +Signed-off-by: Petr Kubánek +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 5 +++++ + 2 files changed, 6 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -674,6 +674,7 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) }, + { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) }, + { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) }, + { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -147,6 +147,11 @@ + #define XSENS_CONVERTER_6_PID 0xD38E + #define XSENS_CONVERTER_7_PID 0xD38F + ++/** ++ * Zolix (www.zolix.com.cb) product ids ++ */ ++#define FTDI_OMNI1509 0xD491 /* Omni1509 embedded USB-serial */ ++ + /* + * NDI (www.ndigital.com) product ids + */ diff --git a/queue-3.0/usb-option-add-changhong-ch690.patch b/queue-3.0/usb-option-add-changhong-ch690.patch new file mode 100644 index 00000000000..07d16c6cb89 --- /dev/null +++ b/queue-3.0/usb-option-add-changhong-ch690.patch @@ -0,0 +1,44 @@ +From d4fa681541aa7bf8570d03426dd7ba663a71c467 Mon Sep 17 00:00:00 2001 +From: Bjørn Mork +Date: Fri, 1 Feb 2013 12:06:51 +0100 +Subject: USB: option: add Changhong CH690 + +From: Bjørn Mork + +commit d4fa681541aa7bf8570d03426dd7ba663a71c467 upstream. + +New device with 3 serial interfaces: + + If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend) Sub=ff Prot=ff + If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend) Sub=ff Prot=ff + If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend) Sub=ff Prot=ff + If#= 3 Alt= 0 #EPs= 2 Cls=08(stor) Sub=06 Prot=50 + +Signed-off-by: Bjørn Mork +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -454,6 +454,10 @@ static void option_instat_callback(struc + #define TPLINK_VENDOR_ID 0x2357 + #define TPLINK_PRODUCT_MA180 0x0201 + ++/* Changhong products */ ++#define CHANGHONG_VENDOR_ID 0x2077 ++#define CHANGHONG_PRODUCT_CH690 0x7001 ++ + /* some devices interfaces need special handling due to a number of reasons */ + enum option_blacklist_reason { + OPTION_BLACKLIST_NONE = 0, +@@ -1326,6 +1330,7 @@ static const struct usb_device_id option + { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, + { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, ++ { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) }, + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/queue-3.0/usb-option-add-support-for-telit-le920.patch b/queue-3.0/usb-option-add-support-for-telit-le920.patch new file mode 100644 index 00000000000..378ebdc7982 --- /dev/null +++ b/queue-3.0/usb-option-add-support-for-telit-le920.patch @@ -0,0 +1,49 @@ +From 03eb466f276ceef9dcf023dc5474db02af68aad9 Mon Sep 17 00:00:00 2001 +From: Daniele Palmas +Date: Mon, 28 Jan 2013 16:47:10 +0100 +Subject: USB: option: add support for Telit LE920 + +From: Daniele Palmas + +commit 03eb466f276ceef9dcf023dc5474db02af68aad9 upstream. + +Add PID and special handling for Telit LE920 + +Signed-off-by: Daniele Palmas +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -242,6 +242,7 @@ static void option_instat_callback(struc + #define TELIT_PRODUCT_CC864_DUAL 0x1005 + #define TELIT_PRODUCT_CC864_SINGLE 0x1006 + #define TELIT_PRODUCT_DE910_DUAL 0x1010 ++#define TELIT_PRODUCT_LE920 0x1200 + + /* ZTE PRODUCTS */ + #define ZTE_VENDOR_ID 0x19d2 +@@ -534,6 +535,11 @@ static const struct option_blacklist_inf + .reserved = BIT(3) | BIT(4), + }; + ++static const struct option_blacklist_info telit_le920_blacklist = { ++ .sendsetup = BIT(0), ++ .reserved = BIT(1) | BIT(5), ++}; ++ + static const struct usb_device_id option_ids[] = { + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, +@@ -784,6 +790,8 @@ static const struct usb_device_id option + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_DUAL) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, ++ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920), ++ .driver_info = (kernel_ulong_t)&telit_le920_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, diff --git a/queue-3.0/usb-qcserial-add-telit-gobi-qdl-device.patch b/queue-3.0/usb-qcserial-add-telit-gobi-qdl-device.patch new file mode 100644 index 00000000000..081e8e3e020 --- /dev/null +++ b/queue-3.0/usb-qcserial-add-telit-gobi-qdl-device.patch @@ -0,0 +1,28 @@ +From 78796ae17eacedcdcaaeb03ba73d2e532a4c8f83 Mon Sep 17 00:00:00 2001 +From: Daniele Palmas +Date: Mon, 28 Jan 2013 16:48:54 +0100 +Subject: USB: qcserial: add Telit Gobi QDL device + +From: Daniele Palmas + +commit 78796ae17eacedcdcaaeb03ba73d2e532a4c8f83 upstream. + +Add VID and PID for Telit Gobi QDL device + +Signed-off-by: Daniele Palmas +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/qcserial.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -54,6 +54,7 @@ static const struct usb_device_id id_tab + {DEVICE_G1K(0x05c6, 0x9221)}, /* Generic Gobi QDL device */ + {DEVICE_G1K(0x05c6, 0x9231)}, /* Generic Gobi QDL device */ + {DEVICE_G1K(0x1f45, 0x0001)}, /* Unknown Gobi QDL device */ ++ {DEVICE_G1K(0x1bc7, 0x900e)}, /* Telit Gobi QDL device */ + + /* Gobi 2000 devices */ + {USB_DEVICE(0x1410, 0xa010)}, /* Novatel Gobi 2000 QDL device */