linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices
@ 2016-03-10 14:48 Josh Boyer
  2016-03-16 15:55 ` Josh Boyer
  0 siblings, 1 reply; 4+ messages in thread
From: Josh Boyer @ 2016-03-10 14:48 UTC (permalink / raw)
  To: Johan Hovold; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel, stable

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices
  2016-03-10 14:48 [PATCH] USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices Josh Boyer
@ 2016-03-16 15:55 ` Josh Boyer
  2016-03-16 16:11   ` Johan Hovold
  0 siblings, 1 reply; 4+ messages in thread
From: Josh Boyer @ 2016-03-16 15:55 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Greg Kroah-Hartman, Linux USB Mailing List,
	Linux-Kernel@Vger. Kernel. Org, stable

On Thu, Mar 10, 2016 at 9:48 AM, Josh Boyer <jwboyer@fedoraproject.org> wrote:
> 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>
> ---

Anything further I need to do on this patch?

josh

>  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
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices
  2016-03-16 15:55 ` Josh Boyer
@ 2016-03-16 16:11   ` Johan Hovold
  2016-04-07  9:14     ` Johan Hovold
  0 siblings, 1 reply; 4+ messages in thread
From: Johan Hovold @ 2016-03-16 16:11 UTC (permalink / raw)
  To: Josh Boyer
  Cc: Johan Hovold, Greg Kroah-Hartman, Linux USB Mailing List,
	Linux-Kernel@Vger. Kernel. Org, stable

On Wed, Mar 16, 2016 at 11:55:49AM -0400, Josh Boyer wrote:
> On Thu, Mar 10, 2016 at 9:48 AM, Josh Boyer <jwboyer@fedoraproject.org> wrote:
> > 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>
> > ---
> 
> Anything further I need to do on this patch?

It looks ok so I don't think so, but I'll take a closer look when
processing my queue after the merge window closes.

Thanks,
Johan

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices
  2016-03-16 16:11   ` Johan Hovold
@ 2016-04-07  9:14     ` Johan Hovold
  0 siblings, 0 replies; 4+ messages in thread
From: Johan Hovold @ 2016-04-07  9:14 UTC (permalink / raw)
  To: Josh Boyer
  Cc: Johan Hovold, Greg Kroah-Hartman, Linux USB Mailing List,
	Linux-Kernel@Vger. Kernel. Org, stable

On Wed, Mar 16, 2016 at 12:11:35PM -0400, Johan Hovold wrote:
> On Wed, Mar 16, 2016 at 11:55:49AM -0400, Josh Boyer wrote:
> > On Thu, Mar 10, 2016 at 9:48 AM, Josh Boyer <jwboyer@fedoraproject.org> wrote:
> > > 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>
> > > ---
> > 
> > Anything further I need to do on this patch?
> 
> It looks ok so I don't think so, but I'll take a closer look when
> processing my queue after the merge window closes.

Now applied, thanks.

Johan

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-04-07  9:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-10 14:48 [PATCH] USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices Josh Boyer
2016-03-16 15:55 ` Josh Boyer
2016-03-16 16:11   ` Johan Hovold
2016-04-07  9:14     ` Johan Hovold

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).