* [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
@ 2014-10-10 8:44 Frans Klaver
2014-10-10 9:01 ` Johan Hovold
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Frans Klaver @ 2014-10-10 8:44 UTC (permalink / raw)
To: Johan Hovold
Cc: Frans Klaver, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
Add new IDs for the Xsens Awinda Station and Awinda Dongle.
Cc: <stable@vger.kernel.org>
Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
---
drivers/usb/serial/ftdi_sio.c | 2 ++
drivers/usb/serial/ftdi_sio_ids.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index dc72b92..4969875 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -663,6 +663,8 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
+ { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
+ { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 5937b2d..be3fffe 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -145,6 +145,8 @@
#define XSENS_VID 0x2639
#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
#define XSENS_MTW_PID 0x0200 /* Xsens MTw */
+#define XSENS_AWINDA_STATION_PID 0x0101
+#define XSENS_AWINDA_DONGLE_PID 0x0102
#define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
#define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
#define XSENS_CONVERTER_2_PID 0xD38A
--
2.1.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 8:44 [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products Frans Klaver
@ 2014-10-10 9:01 ` Johan Hovold
2014-10-10 9:12 ` Frans Klaver
2014-10-10 9:32 ` [PATCH v2] " Frans Klaver
2014-10-10 9:52 ` [PATCH] " Frans Klaver
2 siblings, 1 reply; 12+ messages in thread
From: Johan Hovold @ 2014-10-10 9:01 UTC (permalink / raw)
To: Frans Klaver
Cc: Johan Hovold, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 10:44:54AM +0200, Frans Klaver wrote:
> Add new IDs for the Xsens Awinda Station and Awinda Dongle.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> ---
> drivers/usb/serial/ftdi_sio.c | 2 ++
> drivers/usb/serial/ftdi_sio_ids.h | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index dc72b92..4969875 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -663,6 +663,8 @@ static const struct usb_device_id id_table_combined[] = {
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
> { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
> { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
Could you keep the XSENS_VID entries sorted alphabetically here?
> { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
> { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
> { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> index 5937b2d..be3fffe 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -145,6 +145,8 @@
> #define XSENS_VID 0x2639
> #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
> +#define XSENS_AWINDA_STATION_PID 0x0101
> +#define XSENS_AWINDA_DONGLE_PID 0x0102
And sorted by PID here (even though the two current entries are not, you
could reorder them as well).
I noticed that the below PIDs use the FTDI VID. Perhaps a comment or at
least a separating empty line would be appropriate.
> #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
> #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
> #define XSENS_CONVERTER_2_PID 0xD38A
Thanks,
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:01 ` Johan Hovold
@ 2014-10-10 9:12 ` Frans Klaver
2014-10-10 9:20 ` Johan Hovold
0 siblings, 1 reply; 12+ messages in thread
From: Frans Klaver @ 2014-10-10 9:12 UTC (permalink / raw)
To: Johan Hovold; +Cc: stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:01:17AM +0200, Johan Hovold wrote:
> On Fri, Oct 10, 2014 at 10:44:54AM +0200, Frans Klaver wrote:
> > Add new IDs for the Xsens Awinda Station and Awinda Dongle.
> >
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> > ---
> > drivers/usb/serial/ftdi_sio.c | 2 ++
> > drivers/usb/serial/ftdi_sio_ids.h | 2 ++
> > 2 files changed, 4 insertions(+)
> >
> > diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> > index dc72b92..4969875 100644
> > --- a/drivers/usb/serial/ftdi_sio.c
> > +++ b/drivers/usb/serial/ftdi_sio.c
> > @@ -663,6 +663,8 @@ static const struct usb_device_id id_table_combined[] = {
> > { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
> > { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
> > { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
> > + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
> > + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
>
> Could you keep the XSENS_VID entries sorted alphabetically here?
Sure thing. Should have been obvious.
> > { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
> > { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
> > { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
> > diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> > index 5937b2d..be3fffe 100644
> > --- a/drivers/usb/serial/ftdi_sio_ids.h
> > +++ b/drivers/usb/serial/ftdi_sio_ids.h
> > @@ -145,6 +145,8 @@
> > #define XSENS_VID 0x2639
> > #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> > #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
> > +#define XSENS_AWINDA_STATION_PID 0x0101
> > +#define XSENS_AWINDA_DONGLE_PID 0x0102
>
> And sorted by PID here (even though the two current entries are not, you
> could reorder them as well).
>
> I noticed that the below PIDs use the FTDI VID. Perhaps a comment or at
> least a separating empty line would be appropriate.
>
> > #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
> > #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
> > #define XSENS_CONVERTER_2_PID 0xD38A
I'll move the new entries up. How about I throw in a separate patch that
cleans up stuff around the PID definitions? There's some alignment off
as well. That doesn't need to go into stable, I think.
Thanks,
Frans
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:12 ` Frans Klaver
@ 2014-10-10 9:20 ` Johan Hovold
2014-10-10 9:25 ` Frans Klaver
0 siblings, 1 reply; 12+ messages in thread
From: Johan Hovold @ 2014-10-10 9:20 UTC (permalink / raw)
To: Frans Klaver
Cc: Johan Hovold, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:12:09AM +0200, Frans Klaver wrote:
> On Fri, Oct 10, 2014 at 11:01:17AM +0200, Johan Hovold wrote:
> > On Fri, Oct 10, 2014 at 10:44:54AM +0200, Frans Klaver wrote:
> > > diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> > > index 5937b2d..be3fffe 100644
> > > --- a/drivers/usb/serial/ftdi_sio_ids.h
> > > +++ b/drivers/usb/serial/ftdi_sio_ids.h
> > > @@ -145,6 +145,8 @@
> > > #define XSENS_VID 0x2639
> > > #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> > > #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
> > > +#define XSENS_AWINDA_STATION_PID 0x0101
> > > +#define XSENS_AWINDA_DONGLE_PID 0x0102
> >
> > And sorted by PID here (even though the two current entries are not, you
> > could reorder them as well).
> >
> > I noticed that the below PIDs use the FTDI VID. Perhaps a comment or at
> > least a separating empty line would be appropriate.
> >
> > > #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
> > > #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
> > > #define XSENS_CONVERTER_2_PID 0xD38A
>
> I'll move the new entries up. How about I throw in a separate patch that
> cleans up stuff around the PID definitions? There's some alignment off
> as well. That doesn't need to go into stable, I think.
As long as you keep the clean up minimal (e.g. the reorder the two
entries above and add a comment or new line, skip the alignment bit) it
can all go in one patch along with the new PIDs.
That way there'll be no conflicts when future PID-patches get backported
to stable.
Thanks,
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:20 ` Johan Hovold
@ 2014-10-10 9:25 ` Frans Klaver
0 siblings, 0 replies; 12+ messages in thread
From: Frans Klaver @ 2014-10-10 9:25 UTC (permalink / raw)
To: Johan Hovold; +Cc: stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:20:14AM +0200, Johan Hovold wrote:
> On Fri, Oct 10, 2014 at 11:12:09AM +0200, Frans Klaver wrote:
> > I'll move the new entries up. How about I throw in a separate patch that
> > cleans up stuff around the PID definitions? There's some alignment off
> > as well. That doesn't need to go into stable, I think.
>
> As long as you keep the clean up minimal (e.g. the reorder the two
> entries above and add a comment or new line, skip the alignment bit) it
> can all go in one patch along with the new PIDs.
>
> That way there'll be no conflicts when future PID-patches get backported
> to stable.
Alright. Expect a new patch soonish.
Thanks,
Frans
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 8:44 [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products Frans Klaver
2014-10-10 9:01 ` Johan Hovold
@ 2014-10-10 9:32 ` Frans Klaver
2014-10-10 9:34 ` Johan Hovold
2014-10-10 9:52 ` [PATCH] " Frans Klaver
2 siblings, 1 reply; 12+ messages in thread
From: Frans Klaver @ 2014-10-10 9:32 UTC (permalink / raw)
To: Johan Hovold
Cc: Frans Klaver, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
Add new IDs for the Xsens Awinda Station and Awinda Dongle.
While at it, order the definitions by PID and add a logical separation
between devices using Xsens' VID and those using FTDI's VID.
Cc: <stable@vger.kernel.org>
Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
---
drivers/usb/serial/ftdi_sio.c | 2 ++
drivers/usb/serial/ftdi_sio_ids.h | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index dc72b92..e4eccb6 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -661,6 +661,8 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
+ { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
+ { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 5937b2d..b68084c 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -143,8 +143,12 @@
* Xsens Technologies BV products (http://www.xsens.com).
*/
#define XSENS_VID 0x2639
-#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
+#define XSENS_AWINDA_STATION_PID 0x0101
+#define XSENS_AWINDA_DONGLE_PID 0x0102
#define XSENS_MTW_PID 0x0200 /* Xsens MTw */
+#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
+
+/* Xsens devices using FTDI VID */
#define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
#define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
#define XSENS_CONVERTER_2_PID 0xD38A
--
2.1.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v2] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:32 ` [PATCH v2] " Frans Klaver
@ 2014-10-10 9:34 ` Johan Hovold
2014-10-10 9:45 ` Frans Klaver
0 siblings, 1 reply; 12+ messages in thread
From: Johan Hovold @ 2014-10-10 9:34 UTC (permalink / raw)
To: Frans Klaver
Cc: Johan Hovold, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:32:27AM +0200, Frans Klaver wrote:
> Add new IDs for the Xsens Awinda Station and Awinda Dongle.
>
> While at it, order the definitions by PID and add a logical separation
> between devices using Xsens' VID and those using FTDI's VID.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> ---
> drivers/usb/serial/ftdi_sio.c | 2 ++
> drivers/usb/serial/ftdi_sio_ids.h | 6 +++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index dc72b92..e4eccb6 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -661,6 +661,8 @@ static const struct usb_device_id id_table_combined[] = {
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
These are still not in alphabetical order. :)
> { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
> { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
> { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> index 5937b2d..b68084c 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -143,8 +143,12 @@
> * Xsens Technologies BV products (http://www.xsens.com).
> */
> #define XSENS_VID 0x2639
> -#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> +#define XSENS_AWINDA_STATION_PID 0x0101
> +#define XSENS_AWINDA_DONGLE_PID 0x0102
> #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
> +#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> +
> +/* Xsens devices using FTDI VID */
> #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
> #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
> #define XSENS_CONVERTER_2_PID 0xD38A
Looks good otherwise.
Thanks,
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:34 ` Johan Hovold
@ 2014-10-10 9:45 ` Frans Klaver
0 siblings, 0 replies; 12+ messages in thread
From: Frans Klaver @ 2014-10-10 9:45 UTC (permalink / raw)
To: Johan Hovold; +Cc: stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:34:43AM +0200, Johan Hovold wrote:
> On Fri, Oct 10, 2014 at 11:32:27AM +0200, Frans Klaver wrote:
> > Add new IDs for the Xsens Awinda Station and Awinda Dongle.
> >
> > While at it, order the definitions by PID and add a logical separation
> > between devices using Xsens' VID and those using FTDI's VID.
> >
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> > ---
> > drivers/usb/serial/ftdi_sio.c | 2 ++
> > drivers/usb/serial/ftdi_sio_ids.h | 6 +++++-
> > 2 files changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> > index dc72b92..e4eccb6 100644
> > --- a/drivers/usb/serial/ftdi_sio.c
> > +++ b/drivers/usb/serial/ftdi_sio.c
> > @@ -661,6 +661,8 @@ static const struct usb_device_id id_table_combined[] = {
> > { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
> > { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
> > { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
> > + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
> > + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
>
> These are still not in alphabetical order. :)
*goes and hides in the woods*
Frans
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 8:44 [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products Frans Klaver
2014-10-10 9:01 ` Johan Hovold
2014-10-10 9:32 ` [PATCH v2] " Frans Klaver
@ 2014-10-10 9:52 ` Frans Klaver
2014-10-10 9:54 ` Johan Hovold
2014-10-22 8:14 ` Johan Hovold
2 siblings, 2 replies; 12+ messages in thread
From: Frans Klaver @ 2014-10-10 9:52 UTC (permalink / raw)
To: Johan Hovold
Cc: Frans Klaver, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
Add new IDs for the Xsens Awinda Station and Awinda Dongle.
While at it, order the definitions by PID and add a logical separation
between devices using Xsens' VID and those using FTDI's VID.
Cc: <stable@vger.kernel.org>
Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
---
Third time's a charm.
drivers/usb/serial/ftdi_sio.c | 2 ++
drivers/usb/serial/ftdi_sio_ids.h | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index dc72b92..1f73ca3 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -661,6 +661,8 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
+ { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
+ { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 5937b2d..b68084c 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -143,8 +143,12 @@
* Xsens Technologies BV products (http://www.xsens.com).
*/
#define XSENS_VID 0x2639
-#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
+#define XSENS_AWINDA_STATION_PID 0x0101
+#define XSENS_AWINDA_DONGLE_PID 0x0102
#define XSENS_MTW_PID 0x0200 /* Xsens MTw */
+#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
+
+/* Xsens devices using FTDI VID */
#define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
#define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
#define XSENS_CONVERTER_2_PID 0xD38A
--
2.1.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:52 ` [PATCH] " Frans Klaver
@ 2014-10-10 9:54 ` Johan Hovold
2014-10-10 10:32 ` Frans Klaver
2014-10-22 8:14 ` Johan Hovold
1 sibling, 1 reply; 12+ messages in thread
From: Johan Hovold @ 2014-10-10 9:54 UTC (permalink / raw)
To: Frans Klaver
Cc: Johan Hovold, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:52:08AM +0200, Frans Klaver wrote:
> Add new IDs for the Xsens Awinda Station and Awinda Dongle.
>
> While at it, order the definitions by PID and add a logical separation
> between devices using Xsens' VID and those using FTDI's VID.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> ---
> Third time's a charm.
Thanks for your persistence. :)
I'll queue it up when rc1 is out.
Thanks,
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:54 ` Johan Hovold
@ 2014-10-10 10:32 ` Frans Klaver
0 siblings, 0 replies; 12+ messages in thread
From: Frans Klaver @ 2014-10-10 10:32 UTC (permalink / raw)
To: Johan Hovold; +Cc: stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:54:00AM +0200, Johan Hovold wrote:
> On Fri, Oct 10, 2014 at 11:52:08AM +0200, Frans Klaver wrote:
> > Add new IDs for the Xsens Awinda Station and Awinda Dongle.
> >
> > While at it, order the definitions by PID and add a logical separation
> > between devices using Xsens' VID and those using FTDI's VID.
> >
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> > ---
> > Third time's a charm.
>
> Thanks for your persistence. :)
No problem. I plan on persisting for a couple of more decades.
Thanks,
Frans
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products
2014-10-10 9:52 ` [PATCH] " Frans Klaver
2014-10-10 9:54 ` Johan Hovold
@ 2014-10-22 8:14 ` Johan Hovold
1 sibling, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2014-10-22 8:14 UTC (permalink / raw)
To: Frans Klaver
Cc: Johan Hovold, stable, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, Oct 10, 2014 at 11:52:08AM +0200, Frans Klaver wrote:
> Add new IDs for the Xsens Awinda Station and Awinda Dongle.
>
> While at it, order the definitions by PID and add a logical separation
> between devices using Xsens' VID and those using FTDI's VID.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> ---
> Third time's a charm.
Applied, thanks.
Johan
> drivers/usb/serial/ftdi_sio.c | 2 ++
> drivers/usb/serial/ftdi_sio_ids.h | 6 +++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index dc72b92..1f73ca3 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -661,6 +661,8 @@ static const struct usb_device_id id_table_combined[] = {
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
> { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
> { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
> { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> index 5937b2d..b68084c 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -143,8 +143,12 @@
> * Xsens Technologies BV products (http://www.xsens.com).
> */
> #define XSENS_VID 0x2639
> -#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> +#define XSENS_AWINDA_STATION_PID 0x0101
> +#define XSENS_AWINDA_DONGLE_PID 0x0102
> #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
> +#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> +
> +/* Xsens devices using FTDI VID */
> #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
> #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
> #define XSENS_CONVERTER_2_PID 0xD38A
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-10-22 8:14 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-10 8:44 [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products Frans Klaver
2014-10-10 9:01 ` Johan Hovold
2014-10-10 9:12 ` Frans Klaver
2014-10-10 9:20 ` Johan Hovold
2014-10-10 9:25 ` Frans Klaver
2014-10-10 9:32 ` [PATCH v2] " Frans Klaver
2014-10-10 9:34 ` Johan Hovold
2014-10-10 9:45 ` Frans Klaver
2014-10-10 9:52 ` [PATCH] " Frans Klaver
2014-10-10 9:54 ` Johan Hovold
2014-10-10 10:32 ` Frans Klaver
2014-10-22 8: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).