3.14-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

diff --git a/queue-3.14/series b/queue-3.14/series
index 807151e43a9685e87250f0f3aadb8baff0db5cfc..720db36236631a28cf541855f8639607ac0ccd13 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -16,3 +16,5 @@ sched-fix-rlimit_rttime-when-pi-boosting-to-rt.patch
 writeback-add-missing-initial_jiffies-init-in-global_update_bandwidth.patch
 writeback-fix-possible-underflow-in-write-bandwidth-calculation.patch
 radeon-do-not-directly-dereference-pointers-to-bios-area.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.14/usb-ftdi_sio-added-custom-pid-for-synapse-wireless-product.patch b/queue-3.14/usb-ftdi_sio-added-custom-pid-for-synapse-wireless-product.patch
new file mode 100644 (file)
index 0000000..34c8c7b
--- /dev/null
+++ b/queue-3.14/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 <cardoe@cardoe.com>
+Date: Sun, 15 Mar 2015 21:56:04 -0500
+Subject: USB: ftdi_sio: Added custom PID for Synapse Wireless product
+
+From: Doug Goldstein <cardoe@cardoe.com>
+
+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 <cardoe@cardoe.com>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -617,6 +617,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.14/usb-ftdi_sio-use-jtag-quirk-for-snap-connect-e10.patch b/queue-3.14/usb-ftdi_sio-use-jtag-quirk-for-snap-connect-e10.patch
new file mode 100644 (file)
index 0000000..50cb6aa
--- /dev/null
+++ b/queue-3.14/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 <cardoe@cardoe.com>
+Date: Mon, 23 Mar 2015 20:34:48 -0500
+Subject: USB: ftdi_sio: Use jtag quirk for SNAP Connect E10
+
+From: Doug Goldstein <cardoe@cardoe.com>
+
+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 <cardoe@cardoe.com>
+[johan: clean up probe logic ]
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -1902,8 +1902,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;