patch "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" added to usb-testing

patch "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" added to usb-testing

[gregkh]

This is a note to let you know that I've just added the patch titled

    USB: serial: ftdi_sio: add Id for Physik Instrumente E-870

to my usb git tree which can be found at
    git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-testing branch.

The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)

The patch will be merged to the usb-next branch sometime soon,
after it passes testing, and the merge window is open.

If you have any questions about this process, please let me know.


>From 79a0b33165d8d8ec0840fcfc74fd0a8f219abeee Mon Sep 17 00:00:00 2001
From: "Teichmann, Martin" <martin.teichmann@xfel.eu>
Date: Thu, 29 Mar 2018 08:39:37 +0200
Subject: USB: serial: ftdi_sio: add Id for Physik Instrumente E-870

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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 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 f58c4ff6b387..85774cf4cc8f 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 8b4ecd2bd297..14dff44a2a93 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.
-- 
2.16.3

Sorry, Patch wrong (was: patch "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" added to usb-testing)

[Teichmann, Martin]

Dear Greg, dear Johan, dear list,

I'm very sorry I was a bit quick in sending you a patch for the PI E-870 device, because it's actually wrong. Everything seemed to work fine, until I realized that once in a while two characters were missing. Checking dmesg I realized error messages had piled up. It turns out, the device is not compatible with the ftdi_sio driver in the end. I hope this can be undone...

The device, however works with a usb-serial-simple driver. Unfortunately, it is not as easy as for the E-870 to supply a patch, as usb-serial-simple does not just contain a list of VID and PIDs, but actually creates a new entry somewhere in /sys/bus for each vendor. I would like to send in patch for this later, but this time properly tested...

Sincerely Yours

Martin Teichmann

----- Original Message -----
From: "Greg KH" <gregkh@linuxfoundation.org>
To: "martin teichmann" <martin.teichmann@xfel.eu>, "Johan Hovold" <johan@kernel.org>, stable@vger.kernel.org
Sent: Thursday, 29 March, 2018 11:24:18
Subject: patch "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" added to usb-testing

This is a note to let you know that I've just added the patch titled

    USB: serial: ftdi_sio: add Id for Physik Instrumente E-870

to my usb git tree which can be found at
    git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-testing branch.

The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)

The patch will be merged to the usb-next branch sometime soon,
after it passes testing, and the merge window is open.

If you have any questions about this process, please let me know.


>From 79a0b33165d8d8ec0840fcfc74fd0a8f219abeee Mon Sep 17 00:00:00 2001
From: "Teichmann, Martin" <martin.teichmann@xfel.eu>
Date: Thu, 29 Mar 2018 08:39:37 +0200
Subject: USB: serial: ftdi_sio: add Id for Physik Instrumente E-870

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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 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 f58c4ff6b387..85774cf4cc8f 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 8b4ecd2bd297..14dff44a2a93 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.
-- 
2.16.3

Re: Sorry, Patch wrong (was: patch "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" added to usb-testing)

[Johan Hovold]

On Thu, Mar 29, 2018 at 01:49:02PM +0200, Teichmann, Martin wrote:
> Dear Greg, dear Johan, dear list,
> 
> I'm very sorry I was a bit quick in sending you a patch for the PI
> E-870 device, because it's actually wrong. Everything seemed to work
> fine, until I realized that once in a while two characters were
> missing. Checking dmesg I realized error messages had piled up. It
> turns out, the device is not compatible with the ftdi_sio driver in
> the end. I hope this can be undone...

No worries, I just sent a revert patch to Greg.

> The device, however works with a usb-serial-simple driver.
> Unfortunately, it is not as easy as for the E-870 to supply a patch,
> as usb-serial-simple does not just contain a list of VID and PIDs, but
> actually creates a new entry somewhere in /sys/bus for each vendor. I
> would like to send in patch for this later, but this time properly
> tested...

Try first to determine what chip this really is (e.g. by opening the
device). Chances are there's already a driver for it. Full "lsusb -v"
might also give some clues.

Thanks,
Johan