diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-11 08:12:05 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-11 08:15:44 -0500 |
| commit | be35f77c2aa7c44bba1d9120cecc8b3fe533d7f9 (patch) | |
| tree | 28a35752b71aec8f1bc37ae0c7f3722b2c8784bf | |
| parent | 3127403f31120fa1f437c28b96d6f2d7d8e2a793 (diff) | |
| download | kernel-be35f77c2aa7c44bba1d9120cecc8b3fe533d7f9.tar.gz kernel-be35f77c2aa7c44bba1d9120cecc8b3fe533d7f9.tar.xz kernel-be35f77c2aa7c44bba1d9120cecc8b3fe533d7f9.zip | |
Add patch for ICP DAS I-756xU devices (rhbz 1316136)
| -rw-r--r-- | USB-serial-ftdi_sio-Add-support-for-ICP-DAS-I-756xU-.patch | 59 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 65 insertions, 0 deletions
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 000000000..ac8e71c72 --- /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 1bf8f1726..af22cf783 100644 --- a/kernel.spec +++ b/kernel.spec @@ -613,6 +613,9 @@ Patch648: 0001-mm-CONFIG_NR_ZONES_EXTENDED.patch #rhbz 1312102 Patch649: perf-tools-Fix-python-extension-build.patch +#rhbz 1316136 +Patch663: USB-serial-ftdi_sio-Add-support-for-ICP-DAS-I-756xU-.patch + # END OF PATCH DEFINITIONS %endif @@ -2134,6 +2137,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 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc7.git3.1 - Linux v4.5-rc7-215-gf2c1242 |