ftdi_sio: add Id for Physik Instrumente E-870

ftdi_sio: add Id for Physik Instrumente E-870

[Teichmann, Martin]

This adds support for the Physik Instrumente E-870 PIShift Drive
Electronics, a Piezo motor driver.

Signed-off-by: Martin Teichmann <martin.teichmann@xfel.eu>
---
 drivers/usb/serial/ftdi_sio.c     | 1 +
 drivers/usb/serial/ftdi_sio_ids.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f58c4ff..85774cf 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -893,6 +893,7 @@ static const struct usb_device_id id_table_combined[] = {
 	{ USB_DEVICE(PI_VID, PI_1014_PID) },
 	{ USB_DEVICE(PI_VID, PI_1015_PID) },
 	{ USB_DEVICE(PI_VID, PI_1016_PID) },
+	{ USB_DEVICE(PI_VID, PI_E870_PID) },
 	{ USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },
 	{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
 	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 8b4ecd2..14dff44 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -978,6 +978,7 @@
 #define PI_1014_PID	0x1014  /* PI Device */
 #define PI_1015_PID	0x1015  /* PI Device */
 #define PI_1016_PID	0x1016  /* PI Digital Servo Module */
+#define PI_E870_PID	0x1019  /* PI E-870 Piezomotor Controller */
 
 /*
  * Kondo Kagaku Co.Ltd.

ftdi_sio: add Id for Physik Instrumente E-870

[Johan Hovold]

On Thu, Mar 29, 2018 at 08:39:37AM +0200, Teichmann, Martin wrote:
> This adds support for the Physik Instrumente E-870 PIShift Drive
> Electronics, a Piezo motor driver.
> 
> Signed-off-by: Martin Teichmann <martin.teichmann@xfel.eu>

Now applied with an updated commit summary (prefix).

Thanks,
Johan
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ftdi_sio: add Id for Physik Instrumente E-870

[Greg Kroah-Hartman]

On Thu, Mar 29, 2018 at 08:39:37AM +0200, Teichmann, Martin wrote:
> This adds support for the Physik Instrumente E-870 PIShift Drive
> Electronics, a Piezo motor driver.
> 
> Signed-off-by: Martin Teichmann <martin.teichmann@xfel.eu>
> ---
>  drivers/usb/serial/ftdi_sio.c     | 1 +
>  drivers/usb/serial/ftdi_sio_ids.h | 1 +
>  2 files changed, 2 insertions(+)

Johan, want me to pick this one up?  I think you missed it in your last
pull request.

thanks,

greg k-h
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ftdi_sio: add Id for Physik Instrumente E-870

[Johan Hovold]

On Thu, May 31, 2018 at 12:39:41PM +0200, Greg Kroah-Hartman wrote:
> On Thu, Mar 29, 2018 at 08:39:37AM +0200, Teichmann, Martin wrote:
> > This adds support for the Physik Instrumente E-870 PIShift Drive
> > Electronics, a Piezo motor driver.
> > 
> > Signed-off-by: Martin Teichmann <martin.teichmann@xfel.eu>
> > ---
> >  drivers/usb/serial/ftdi_sio.c     | 1 +
> >  drivers/usb/serial/ftdi_sio_ids.h | 1 +
> >  2 files changed, 2 insertions(+)
> 
> Johan, want me to pick this one up?  I think you missed it in your last
> pull request.

No, this one was actually already applied and later reverted when it
turned out it was not really an ftdi device at all:

	5267c5e09c25 ("Revert "USB: serial: ftdi_sio: add Id for Physik
		       Instrumente E-870"")

Thanks,
Johan
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ftdi_sio: add Id for Physik Instrumente E-870

[Greg Kroah-Hartman]

On Thu, May 31, 2018 at 01:24:52PM +0200, Johan Hovold wrote:
> On Thu, May 31, 2018 at 12:39:41PM +0200, Greg Kroah-Hartman wrote:
> > On Thu, Mar 29, 2018 at 08:39:37AM +0200, Teichmann, Martin wrote:
> > > This adds support for the Physik Instrumente E-870 PIShift Drive
> > > Electronics, a Piezo motor driver.
> > > 
> > > Signed-off-by: Martin Teichmann <martin.teichmann@xfel.eu>
> > > ---
> > >  drivers/usb/serial/ftdi_sio.c     | 1 +
> > >  drivers/usb/serial/ftdi_sio_ids.h | 1 +
> > >  2 files changed, 2 insertions(+)
> > 
> > Johan, want me to pick this one up?  I think you missed it in your last
> > pull request.
> 
> No, this one was actually already applied and later reverted when it
> turned out it was not really an ftdi device at all:
> 
> 	5267c5e09c25 ("Revert "USB: serial: ftdi_sio: add Id for Physik
> 		       Instrumente E-870"")

Ah, oops, missed that.  dropping this from my queue now, thanks.

greg k-h
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ftdi_sio: add Id for Physik Instrumente E-870

[Teichmann, Martin]

Hi Greg, Hi everybody,

being the original author of this patch: no. It is wrong.

Greetings

Martin

----- Original Message -----
From: "Greg KH" <gregkh@linuxfoundation.org>
To: "Johan Hovold" <johan@kernel.org>
Cc: "Teichmann, Martin" <martin.teichmann@xfel.eu>, "linux-usb" <linux-usb@vger.kernel.org>
Sent: Thursday, 31 May, 2018 12:39:41
Subject: Re: [PATCH] ftdi_sio: add Id for Physik Instrumente E-870

On Thu, Mar 29, 2018 at 08:39:37AM +0200, Teichmann, Martin wrote:
> This adds support for the Physik Instrumente E-870 PIShift Drive
> Electronics, a Piezo motor driver.
> 
> Signed-off-by: Martin Teichmann <martin.teichmann@xfel.eu>
> ---
>  drivers/usb/serial/ftdi_sio.c     | 1 +
>  drivers/usb/serial/ftdi_sio_ids.h | 1 +
>  2 files changed, 2 insertions(+)

Johan, want me to pick this one up?  I think you missed it in your last
pull request.

thanks,

greg k-h
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html