From 370f4c4394a71fdcfa46fbeca62aa230f6b60ef7 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Mar 11 2016 13:13:26 +0000
Subject: Add patch for ICP DAS I-756xU devices (rhbz 1316136)


---

diff --git a/USB-serial-ftdi_sio-Add-support-for-ICP-DAS-I-756xU-.patch b/USB-serial-ftdi_sio-Add-support-for-ICP-DAS-I-756xU-.patch
new file mode 100644
index 0000000..ac8e71c
--- /dev/null
+++ b/USB-serial-ftdi_sio-Add-support-for-ICP-DAS-I-756xU-.patch
@@ -0,0 +1,59 @@
+From 94c78c81df3056e573fb84000a32512e9c16e555 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Thu, 10 Mar 2016 08:49:02 -0500
+Subject: [PATCH] USB: serial: ftdi_sio: Add support for ICP DAS I-756xU
+ devices
+
+A Fedora user reports that the ftdi_sio driver works properly for the
+ICP DAS I-7561U device.  Further, the user manual for these devices
+instructs users to load the driver and add the ids using the sysfs
+interface.
+
+Add support for these in the driver directly so that the devices work
+out of the box instead of needing manual configuration.
+
+Reported-by: <thesource@mail.ru>
+CC: stable <stable@vger.kernel.org>
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ drivers/usb/serial/ftdi_sio.c     | 4 ++++
+ drivers/usb/serial/ftdi_sio_ids.h | 8 ++++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+index 8c660ae401d8..b61f12160d37 100644
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -1004,6 +1004,10 @@ static const struct usb_device_id id_table_combined[] = {
+ 	{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_DISPLAY_PID) },
+ 	{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_LITE_PID) },
+ 	{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_ANALOG_PID) },
++	/* ICP DAS I-756xU devices */
++	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7560U_PID) },
++	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7561U_PID) },
++	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7563U_PID) },
+ 	{ }					/* Terminating entry */
+ };
+ 
+diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
+index a84df2513994..a4ec24ce6a11 100644
+--- a/drivers/usb/serial/ftdi_sio_ids.h
++++ b/drivers/usb/serial/ftdi_sio_ids.h
+@@ -872,6 +872,14 @@
+ #define NOVITUS_BONO_E_PID		0x6010
+ 
+ /*
++ * ICPDAS I-756*U devices
++ */
++#define ICPDAS_VID				0x1b5c
++#define ICPDAS_I7560U_PID			0x0103
++#define ICPDAS_I7561U_PID			0x0104
++#define ICPDAS_I7563U_PID			0x0105
++
++/*
+  * RT Systems programming cables for various ham radios
+  */
+ #define RTSYSTEMS_VID		0x2100	/* Vendor ID */
+-- 
+2.5.0
+
diff --git a/kernel.spec b/kernel.spec
index a21d040..09c15b0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -631,6 +631,9 @@ Patch661: 0001-arm64-account-for-sparsemem-section-alignment-when-c.patch
 #rhbz 1316719
 Patch662: 0001-cdc-acm-fix-NULL-pointer-reference.patch
 
+#rhbz 1316136
+Patch663: USB-serial-ftdi_sio-Add-support-for-ICP-DAS-I-756xU-.patch
+
 # END OF PATCH DEFINITIONS
 %endif
 
@@ -1323,6 +1326,10 @@ ApplyPatch 0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch
 ApplyPatch 0001-arm64-account-for-sparsemem-section-alignment-when-c.patch
 
 ApplyPatch 0001-cdc-acm-fix-NULL-pointer-reference.patch
+
+#rhbz 1316136
+ApplyPatch USB-serial-ftdi_sio-Add-support-for-ICP-DAS-I-756xU-.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2172,6 +2179,9 @@ fi
 #
 # 
 %changelog
+* Fri Mar 11 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch for ICP DAS I-756xU devices (rhbz 1316136)
+
 * Thu Mar 10 2016 Laura Abbott <labbott@redhat.com>
 - cdc-acm: fix NULL pointer reference (rhbz 1316719)