From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, "Petr Kubánek" <petr@kubanek.net>
Subject: [ 07/16] USB: ftdi_sio: add Zolix FTDI PID
Date: Thu, 7 Feb 2013 16:58:06 -0800 [thread overview]
Message-ID: <20130208004628.343610372@linuxfoundation.org> (raw)
In-Reply-To: <20130208004627.112511141@linuxfoundation.org>
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Kubánek <petr@kubanek.net>
commit 0ba3b2ccc72b3df5c305d61f59d93ab0f0e87991 upstream.
Add support for Zolix Omni 1509 monochromator custom USB-RS232 converter.
Signed-off-by: Petr Kubánek <petr@kubanek.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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
*/
next prev parent reply other threads:[~2013-02-08 0:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-08 0:57 [ 00/16] 3.0.63-stable review Greg Kroah-Hartman
2013-02-08 0:58 ` [ 01/16] drm/radeon/evergreen+: wait for the MC to settle after MC blackout Greg Kroah-Hartman
2013-02-08 0:58 ` [ 02/16] drm/radeon: add quirk for RV100 board Greg Kroah-Hartman
2013-02-08 0:58 ` [ 03/16] drm/radeon: Calling object_unrefer() when creating fb failure Greg Kroah-Hartman
2013-02-08 0:58 ` [ 04/16] x86-64: Replace left over sti/cli in ia32 audit exit code Greg Kroah-Hartman
2013-02-08 0:58 ` [ 05/16] nilfs2: fix fix very long mount time issue Greg Kroah-Hartman
2013-02-08 0:58 ` [ 06/16] drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler Greg Kroah-Hartman
2013-02-08 0:58 ` Greg Kroah-Hartman [this message]
2013-02-08 0:58 ` [ 08/16] USB: ftdi_sio: add PID/VID entries for ELV WS 300 PC II Greg Kroah-Hartman
2013-02-08 0:58 ` [ 09/16] USB: option: add support for Telit LE920 Greg Kroah-Hartman
2013-02-08 0:58 ` [ 10/16] USB: option: add Changhong CH690 Greg Kroah-Hartman
2013-02-08 0:58 ` [ 11/16] USB: qcserial: add Telit Gobi QDL device Greg Kroah-Hartman
2013-02-08 0:58 ` [ 12/16] USB: EHCI: fix bug in scheduling periodic split transfers Greg Kroah-Hartman
2013-02-08 0:58 ` [ 13/16] USB: storage: Define a new macro for USB storage match rules Greg Kroah-Hartman
2013-02-08 0:58 ` [ 14/16] USB: storage: optimize to match the Huawei USB storage devices and support new switch command Greg Kroah-Hartman
2013-02-08 0:58 ` [ 15/16] xhci: Fix isoc TD encoding Greg Kroah-Hartman
2013-02-08 0:58 ` [ 16/16] USB: XHCI: fix memory leak of URB-private data Greg Kroah-Hartman
2013-02-08 20:28 ` [ 00/16] 3.0.63-stable review Shuah Khan
2013-02-09 12:09 ` Satoru Takeuchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130208004628.343610372@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=petr@kubanek.net \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).