From: Greg Kroah-Hartman Date: Fri, 17 Apr 2015 10:09:59 +0000 (+0200) Subject: 3.19-stable patches X-Git-Tag: v3.10.75~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61edf2a80dbacd4c915b97230f2e3d2d0ad683be;p=thirdparty%2Fkernel%2Fstable-queue.git 3.19-stable patches added patches: usb-ftdi_sio-added-custom-pid-for-synapse-wireless-product.patch usb-ftdi_sio-use-jtag-quirk-for-snap-connect-e10.patch usb-keyspan_pda-add-new-device-id.patch --- diff --git a/queue-3.19/series b/queue-3.19/series index c8f4bae593f..956f4de3a96 100644 --- a/queue-3.19/series +++ b/queue-3.19/series @@ -50,3 +50,6 @@ writeback-fix-possible-underflow-in-write-bandwidth-calculation.patch libata-update-crucial-micron-blacklist.patch libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch radeon-do-not-directly-dereference-pointers-to-bios-area.patch +usb-keyspan_pda-add-new-device-id.patch +usb-ftdi_sio-added-custom-pid-for-synapse-wireless-product.patch +usb-ftdi_sio-use-jtag-quirk-for-snap-connect-e10.patch diff --git a/queue-3.19/usb-ftdi_sio-added-custom-pid-for-synapse-wireless-product.patch b/queue-3.19/usb-ftdi_sio-added-custom-pid-for-synapse-wireless-product.patch new file mode 100644 index 00000000000..2b01fa25bc3 --- /dev/null +++ b/queue-3.19/usb-ftdi_sio-added-custom-pid-for-synapse-wireless-product.patch @@ -0,0 +1,46 @@ +From 4899c054a90439477b24da8977db8d738376fe90 Mon Sep 17 00:00:00 2001 +From: Doug Goldstein +Date: Sun, 15 Mar 2015 21:56:04 -0500 +Subject: USB: ftdi_sio: Added custom PID for Synapse Wireless product + +From: Doug Goldstein + +commit 4899c054a90439477b24da8977db8d738376fe90 upstream. + +Synapse Wireless uses the FTDI VID with a custom PID of 0x9090 for their +SNAP Stick 200 product. + +Signed-off-by: Doug Goldstein +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ + 2 files changed, 7 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -604,6 +604,7 @@ static const struct usb_device_id id_tab + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, + /* + * ELV devices: + */ +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -561,6 +561,12 @@ + */ + #define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */ + ++/* ++ * Synapse Wireless product ids (FTDI_VID) ++ * http://www.synapse-wireless.com ++ */ ++#define FTDI_SYNAPSE_SS200_PID 0x9090 /* SS200 - SNAP Stick 200 */ ++ + + /********************************/ + /** third-party VID/PID combos **/ diff --git a/queue-3.19/usb-ftdi_sio-use-jtag-quirk-for-snap-connect-e10.patch b/queue-3.19/usb-ftdi_sio-use-jtag-quirk-for-snap-connect-e10.patch new file mode 100644 index 00000000000..b69c8d6ee49 --- /dev/null +++ b/queue-3.19/usb-ftdi_sio-use-jtag-quirk-for-snap-connect-e10.patch @@ -0,0 +1,39 @@ +From b229a0f840f774d29d8fedbf5deb344ca36b7f1a Mon Sep 17 00:00:00 2001 +From: Doug Goldstein +Date: Mon, 23 Mar 2015 20:34:48 -0500 +Subject: USB: ftdi_sio: Use jtag quirk for SNAP Connect E10 + +From: Doug Goldstein + +commit b229a0f840f774d29d8fedbf5deb344ca36b7f1a upstream. + +This patch uses the existing CALAO Systems ftdi_8u2232c_probe in order +to avoid attaching a TTY to the JTAG port as this board is based on the +CALAO Systems reference design and needs the same fix up. + +Signed-off-by: Doug Goldstein +[johan: clean up probe logic ] +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -1884,8 +1884,12 @@ static int ftdi_8u2232c_probe(struct usb + { + struct usb_device *udev = serial->dev; + +- if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) || +- (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2"))) ++ if (udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ++ return ftdi_jtag_probe(serial); ++ ++ if (udev->product && ++ (!strcmp(udev->product, "BeagleBone/XDS100V2") || ++ !strcmp(udev->product, "SNAP Connect E10"))) + return ftdi_jtag_probe(serial); + + return 0; diff --git a/queue-3.19/usb-keyspan_pda-add-new-device-id.patch b/queue-3.19/usb-keyspan_pda-add-new-device-id.patch new file mode 100644 index 00000000000..94feac316a7 --- /dev/null +++ b/queue-3.19/usb-keyspan_pda-add-new-device-id.patch @@ -0,0 +1,48 @@ +From 5e71fc8629cefae5f3c1a4f498de3fe4f631924a Mon Sep 17 00:00:00 2001 +From: Nathaniel W Filardo +Date: Mon, 16 Mar 2015 11:19:55 -0400 +Subject: USB: keyspan_pda: add new device id + +From: Nathaniel W Filardo + +commit 5e71fc8629cefae5f3c1a4f498de3fe4f631924a upstream. + +Add USB VID/PID for Xircom PGMFHUB USB/serial component. (The hub and SCSI +bridge on that hardware are recognized out of the box by existing drivers.) +Tested VID/PID using new_id and loopback connection and was met with +success, but that's all the testing done. + +Signed-off-by: Nathaniel Wesley Filardo +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/keyspan_pda.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/serial/keyspan_pda.c ++++ b/drivers/usb/serial/keyspan_pda.c +@@ -61,6 +61,7 @@ struct keyspan_pda_private { + /* For Xircom PGSDB9 and older Entrega version of the same device */ + #define XIRCOM_VENDOR_ID 0x085a + #define XIRCOM_FAKE_ID 0x8027 ++#define XIRCOM_FAKE_ID_2 0x8025 /* "PGMFHUB" serial */ + #define ENTREGA_VENDOR_ID 0x1645 + #define ENTREGA_FAKE_ID 0x8093 + +@@ -70,6 +71,7 @@ static const struct usb_device_id id_tab + #endif + #ifdef XIRCOM + { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) }, ++ { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID_2) }, + { USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) }, + #endif + { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) }, +@@ -93,6 +95,7 @@ static const struct usb_device_id id_tab + #ifdef XIRCOM + static const struct usb_device_id id_table_fake_xircom[] = { + { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) }, ++ { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID_2) }, + { USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) }, + { } + };