From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, "Matwey V. Kornilov" <matwey@sai.msu.ru>
Subject: [ 05/40] usb: cp210x new Vendor/Device IDs
Date: Mon, 18 Mar 2013 14:10:43 -0700 [thread overview]
Message-ID: <20130318211016.638847143@linuxfoundation.org> (raw)
In-Reply-To: <20130318211016.254453918@linuxfoundation.org>
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Matwey V. Kornilov" <matwey@sai.msu.ru>
commit be3101c23394af59694c8a2aae6d07f5da62fea5 upstream.
This patch adds support for the Lake Shore Cryotronics devices to
the CP210x driver.
These lines are ported from cp210x driver distributed by Lake Shore web site:
http://www.lakeshore.com/Documents/Lake%20Shore%20cp210x-3.0.0.tar.gz
and licensed under the terms of GPLv2.
Moreover, I've tested this changes with Lake Shore 335 in my labs.
Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/usb/serial/cp210x.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -156,6 +156,25 @@ static const struct usb_device_id id_tab
{ USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
{ USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */
{ USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */
+ { USB_DEVICE(0x1FB9, 0x0100) }, /* Lake Shore Model 121 Current Source */
+ { USB_DEVICE(0x1FB9, 0x0200) }, /* Lake Shore Model 218A Temperature Monitor */
+ { USB_DEVICE(0x1FB9, 0x0201) }, /* Lake Shore Model 219 Temperature Monitor */
+ { USB_DEVICE(0x1FB9, 0x0202) }, /* Lake Shore Model 233 Temperature Transmitter */
+ { USB_DEVICE(0x1FB9, 0x0203) }, /* Lake Shore Model 235 Temperature Transmitter */
+ { USB_DEVICE(0x1FB9, 0x0300) }, /* Lake Shore Model 335 Temperature Controller */
+ { USB_DEVICE(0x1FB9, 0x0301) }, /* Lake Shore Model 336 Temperature Controller */
+ { USB_DEVICE(0x1FB9, 0x0302) }, /* Lake Shore Model 350 Temperature Controller */
+ { USB_DEVICE(0x1FB9, 0x0303) }, /* Lake Shore Model 371 AC Bridge */
+ { USB_DEVICE(0x1FB9, 0x0400) }, /* Lake Shore Model 411 Handheld Gaussmeter */
+ { USB_DEVICE(0x1FB9, 0x0401) }, /* Lake Shore Model 425 Gaussmeter */
+ { USB_DEVICE(0x1FB9, 0x0402) }, /* Lake Shore Model 455A Gaussmeter */
+ { USB_DEVICE(0x1FB9, 0x0403) }, /* Lake Shore Model 475A Gaussmeter */
+ { USB_DEVICE(0x1FB9, 0x0404) }, /* Lake Shore Model 465 Three Axis Gaussmeter */
+ { USB_DEVICE(0x1FB9, 0x0600) }, /* Lake Shore Model 625A Superconducting MPS */
+ { USB_DEVICE(0x1FB9, 0x0601) }, /* Lake Shore Model 642A Magnet Power Supply */
+ { USB_DEVICE(0x1FB9, 0x0602) }, /* Lake Shore Model 648 Magnet Power Supply */
+ { USB_DEVICE(0x1FB9, 0x0700) }, /* Lake Shore Model 737 VSM Controller */
+ { USB_DEVICE(0x1FB9, 0x0701) }, /* Lake Shore Model 776 Hall Matrix */
{ USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
{ USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */
{ USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */
next prev parent reply other threads:[~2013-03-18 21:10 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 21:10 [ 00/40] 3.0.70-stable review Greg Kroah-Hartman
2013-03-18 21:10 ` [ 01/40] qcaux: add Franklin U600 Greg Kroah-Hartman
2013-03-18 21:10 ` [ 02/40] virtio: rng: disallow multiple device registrations, fixes crashes Greg Kroah-Hartman
2013-03-18 21:10 ` [ 03/40] USB: option: add Huawei E5331 Greg Kroah-Hartman
2013-03-18 21:10 ` [ 04/40] USB: cdc-wdm: fix buffer overflow Greg Kroah-Hartman
2013-03-18 21:10 ` Greg Kroah-Hartman [this message]
2013-03-18 21:10 ` [ 06/40] USB: added support for Cinterions products AH6 and PLS8 Greg Kroah-Hartman
2013-03-18 21:10 ` [ 07/40] usb: serial: Add Rigblaster Advantage to device table Greg Kroah-Hartman
2013-03-18 21:10 ` [ 08/40] USB: storage: fix Huawei mode switching regression Greg Kroah-Hartman
2013-03-18 21:10 ` [ 09/40] USB: EHCI: dont check DMA values in QH overlays Greg Kroah-Hartman
2013-03-18 21:10 ` [ 10/40] staging: vt6656: Fix oops on resume from suspend Greg Kroah-Hartman
2013-03-18 21:10 ` [ 11/40] signal: always clear sa_restorer on execve Greg Kroah-Hartman
2013-03-18 21:10 ` [ 12/40] ext3: Fix format string issues Greg Kroah-Hartman
2013-03-18 21:10 ` [ 13/40] tty: serial: fix typo "ARCH_S5P6450" Greg Kroah-Hartman
2013-03-18 21:10 ` [ 14/40] TTY: do not reset masters packet mode Greg Kroah-Hartman
2013-03-18 21:10 ` [ 15/40] md: protect against crash upon fsync on ro array Greg Kroah-Hartman
2013-03-18 21:10 ` [ 16/40] Revert duplicated perf commit Greg Kroah-Hartman
2013-03-21 3:31 ` Ben Hutchings
2013-03-18 21:10 ` [ 17/40] ALSA: seq: Fix missing error handling in snd_seq_timer_open() Greg Kroah-Hartman
2013-03-18 21:10 ` [ 18/40] hwmon: (lineage-pem) Add missing terminating entry for pem_[input|fan]_attributes Greg Kroah-Hartman
2013-03-18 21:10 ` [ 19/40] w1: fix oops when w1_search is called from netlink connector Greg Kroah-Hartman
2013-03-18 21:10 ` [ 20/40] powerpc: Fix cputable entry for 970MP rev 1.0 Greg Kroah-Hartman
2013-03-18 21:10 ` [ 21/40] selinux: use GFP_ATOMIC under spin_lock Greg Kroah-Hartman
2013-03-18 21:11 ` [ 22/40] perf,x86: fix kernel crash with PEBS/BTS after suspend/resume Greg Kroah-Hartman
2013-03-18 21:11 ` [ 23/40] perf,x86: fix wrmsr_on_cpu() warning on suspend/resume Greg Kroah-Hartman
2013-03-18 21:11 ` [ 24/40] perf,x86: fix link failure for non-Intel configs Greg Kroah-Hartman
2013-03-18 21:11 ` [ 25/40] s390/mm: fix flush_tlb_kernel_range() Greg Kroah-Hartman
2013-03-18 21:11 ` [ 26/40] btrfs: use rcu_barrier() to wait for bdev puts at unmount Greg Kroah-Hartman
2013-03-18 21:11 ` [ 27/40] drm/i915: EBUSY status handling added to i915_gem_fault() Greg Kroah-Hartman
2013-03-18 21:11 ` [ 28/40] hwmon: (sht15) Fix memory leak if regulator_enable() fails Greg Kroah-Hartman
2013-03-18 21:11 ` [ 29/40] block: use i_size_write() in bd_set_size() Greg Kroah-Hartman
2013-03-18 21:11 ` [ 30/40] loopdev: fix a deadlock Greg Kroah-Hartman
2013-03-18 21:11 ` [ 31/40] l2tp: Restore socket refcount when sendmsg succeeds Greg Kroah-Hartman
2013-03-18 21:11 ` [ 32/40] rds: limit the size allocated by rds_message_alloc() Greg Kroah-Hartman
2013-03-18 21:11 ` [ 33/40] net: ipv6: Dont purge default router if accept_ra=2 Greg Kroah-Hartman
2013-03-18 21:11 ` [ 34/40] tcp: fix double-counted receiver RTT when leaving receiver fast path Greg Kroah-Hartman
2013-03-18 21:11 ` [ 35/40] tun: add a missing nf_reset() in tun_net_xmit() Greg Kroah-Hartman
2013-03-18 21:11 ` [ 36/40] netlabel: correctly list all the static label mappings Greg Kroah-Hartman
2013-03-18 21:11 ` [ 37/40] bridging: fix rx_handlers return code Greg Kroah-Hartman
2013-03-18 21:11 ` [ 38/40] ipv6: stop multicast forwarding to process interface scoped addresses Greg Kroah-Hartman
2013-03-18 21:11 ` [ 39/40] rtnl: fix info leak on RTM_GETLINK request for VF devices Greg Kroah-Hartman
2013-03-18 21:11 ` [ 40/40] dcbnl: fix various netlink info leaks Greg Kroah-Hartman
2013-03-19 0:47 ` [ 00/40] 3.0.70-stable review Shuah Khan
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=20130318211016.638847143@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matwey@sai.msu.ru \
--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).