Message ID | 20230712141710.3116-2-oneukum@suse.com |
---|---|
State | Superseded |
Headers | show |
Series | [PATCHv2] USB: serial-simple: adding Kaufmann RKS+CAN VCP | expand |
On Wed, Jul 12, 2023 at 04:16:41PM +0200, Oliver Neukum wrote: > Adding the device and product ID > The device is a is a CAN bus interface / license dongle > The device thus is usable either directly from user space > or can be attached to a kernel CAN interface with slcan_attach I reworded the above slightly and added the missing full stops to make it a bit more readable. The result is here: https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-linus&id=66672e61d4a6f8f9011b031d366eeb450fa41117 > v2: improve change log In the future, please keep the changelog below the --- line. > Reported-by: Kaufmann Automotive GmbH <info@kaufmann-automotive.ch> > Tested-by: Kaufmann Automotive GmbH <info@kaufmann-automotive.ch> > Signed-off-by: Oliver Neukum <oneukum@suse.com> > --- > drivers/usb/serial/usb-serial-simple.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c > index 4c6747889a19..3612031030bb 100644 > --- a/drivers/usb/serial/usb-serial-simple.c > +++ b/drivers/usb/serial/usb-serial-simple.c > @@ -117,6 +117,11 @@ DEVICE(suunto, SUUNTO_IDS); > { USB_DEVICE(0x908, 0x0004) } > DEVICE(siemens_mpi, SIEMENS_IDS); > > +/* KAUFMANN RKS+CAN VCP */ > +#define KAUFMANN_IDS() \ > + { USB_DEVICE(0x16d0, 0x0870) } > +DEVICE(kaufmann, KAUFMANN_IDS); > + > /* All of the above structures mushed into two lists */ > static struct usb_serial_driver * const serial_drivers[] = { > &carelink_device, > @@ -133,6 +138,7 @@ static struct usb_serial_driver * const serial_drivers[] = { > &hp4x_device, > &suunto_device, > &siemens_mpi_device, > + &kaufmann_device, > NULL > }; > > @@ -151,6 +157,7 @@ static const struct usb_device_id id_table[] = { > HP4X_IDS(), > SUUNTO_IDS(), > SIEMENS_IDS(), > + KAUFMANN_IDS(), > { }, > }; > MODULE_DEVICE_TABLE(usb, id_table); Looks like you forgot to move the new entries to maintain the (approximate) sort order as I asked you to do. I fixed that up before applying. Johan
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index 4c6747889a19..3612031030bb 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c @@ -117,6 +117,11 @@ DEVICE(suunto, SUUNTO_IDS); { USB_DEVICE(0x908, 0x0004) } DEVICE(siemens_mpi, SIEMENS_IDS); +/* KAUFMANN RKS+CAN VCP */ +#define KAUFMANN_IDS() \ + { USB_DEVICE(0x16d0, 0x0870) } +DEVICE(kaufmann, KAUFMANN_IDS); + /* All of the above structures mushed into two lists */ static struct usb_serial_driver * const serial_drivers[] = { &carelink_device, @@ -133,6 +138,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &hp4x_device, &suunto_device, &siemens_mpi_device, + &kaufmann_device, NULL }; @@ -151,6 +157,7 @@ static const struct usb_device_id id_table[] = { HP4X_IDS(), SUUNTO_IDS(), SIEMENS_IDS(), + KAUFMANN_IDS(), { }, }; MODULE_DEVICE_TABLE(usb, id_table);