From: Johan Hovold <johan@kernel.org>
To: Martyn Welch <martyn.welch@collabora.co.uk>
Cc: Johan Hovold <johan@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-gpio@vger.kernel.org
Subject: Re: [PATCH v5 2/2] USB: serial: cp210x: Adding GE Healthcare Device ID
Date: Thu, 7 Apr 2016 11:55:44 +0200 [thread overview]
Message-ID: <20160407095544.GH25008@localhost> (raw)
In-Reply-To: <57062C26.5080301@collabora.co.uk>
On Thu, Apr 07, 2016 at 10:45:10AM +0100, Martyn Welch wrote:
>
>
> On 07/04/16 10:39, Johan Hovold wrote:
> > On Tue, Mar 29, 2016 at 05:47:29PM +0100, Martyn Welch wrote:
> >> The CP2105 is used in the GE Healthcare Remote Alarm Box, with the
> >> Manufacturer ID of 0x1901 and Product ID of 0x0194.
> >>
> >> Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
> >> ---
> >> drivers/usb/serial/cp210x.c | 1 +
> >> 1 file changed, 1 insertion(+)
> >>
> >> diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
> >> index b1eb8da..5b5c4ec 100644
> >> --- a/drivers/usb/serial/cp210x.c
> >> +++ b/drivers/usb/serial/cp210x.c
> >> @@ -170,6 +170,7 @@ static const struct usb_device_id id_table[] = {
> >> { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
> >> { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
> >> { USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */
> >> + { USB_DEVICE(0x1901, 0x0194) }, /* GE Healthcare Remote Alarm Box */
> >> { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */
> >> { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */
> >> { USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */
> >
> > This one does not apply, what tree did you generate it against against?
> >
>
> The usb-next branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git as
> per your email of 31/01/16.
Ah, new device ids are usually included in the current -rc kernel
(rather than -next) so such patches should be generated against the
usb-linus branch instead (as should any fixes).
Patch now applied.
Thanks,
Johan
next prev parent reply other threads:[~2016-04-07 9:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-29 16:47 [PATCH v5 0/2] USB: serial: GPIO support and GE Device ID for cp210x Martyn Welch
[not found] ` <cover.1459269397.git.martyn.welch-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>
2016-03-29 16:47 ` [PATCH v5 1/2] USB: serial: cp210x: Adding GPIO support for CP2105 Martyn Welch
2016-03-31 13:24 ` Linus Walleij
2016-04-12 8:01 ` Martyn Welch
2016-04-12 8:08 ` Johan Hovold
2016-04-12 8:15 ` Martyn Welch
2016-05-16 9:50 ` Martyn Welch
[not found] ` <57399800.2010706-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>
2016-05-18 8:45 ` Johan Hovold
2016-03-29 16:47 ` [PATCH v5 2/2] USB: serial: cp210x: Adding GE Healthcare Device ID Martyn Welch
[not found] ` <ddee21e702ef47d8c97d6fa3b37acbb8be28634e.1459269397.git.martyn.welch-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>
2016-04-07 9:39 ` Johan Hovold
2016-04-07 9:45 ` Martyn Welch
2016-04-07 9:55 ` Johan Hovold [this message]
2016-04-07 9:57 ` Martyn Welch
2016-04-07 10:04 ` Martyn Welch
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=20160407095544.GH25008@localhost \
--to=johan@kernel.org \
--cc=gnurou@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martyn.welch@collabora.co.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.