[PATCH] USB: serial: ftdi_sio: add id for Brainboxes serial cards

2014-03-31 Thread Johan Hovold 
From: Michele Baldessari 

Custom VID/PIDs for Brainboxes cards as reported in
https://bugzilla.redhat.com/show_bug.cgi?id=1071914

Signed-off-by: Michele Baldessari 
Cc: stable 
Signed-off-by: Johan Hovold 
---
 drivers/usb/serial/ftdi_sio.c | 33 +
 drivers/usb/serial/ftdi_sio_ids.h | 37 +
 2 files changed, 70 insertions(+)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 44ab12986805..7c6e1dedeb06 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -909,6 +909,39 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
/* Cressi Devices */
{ USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
+   /* Brainboxes Devices */
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
{ } /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio_ids.h 
b/drivers/usb/serial/ftdi_sio_ids.h
index e599fbfcde5f..993c93df6874 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1326,3 +1326,40 @@
  * Manufacturer: Cressi
  */
 #define FTDI_CRESSI_PID0x87d0
+
+/*
+ * Brainboxes devices
+ */
+#define BRAINBOXES_VID 0x05d1
+#define BRAINBOXES_VX_001_PID  0x1001 /* VX-001 ExpressCard 1 Port 
RS232 */
+#define BRAINBOXES_VX_012_PID  0x1002 /* VX-012 ExpressCard 2 Port 
RS232 */
+#define BRAINBOXES_VX_023_PID  0x1003 /* VX-023 ExpressCard 1 Port 
RS422/485 */
+#define BRAINBOXES_VX_034_PID  0x1004 /* VX-034 ExpressCard 2 Port 
RS422/485 */
+#define BRAINBOXES_US_101_PID  0x1011 /* US-101 1xRS232 */
+#define BRAINBOXES_US_324_PID  0x1013 /* US-324 1xRS422/485 1Mbaud */
+#define BRAINBOXES_US_606_1_PID0x2001 /* US-606 6 Port RS232 
Serial Port 1 and 2 */
+#define BRAINBOXES_US_606_2_PID0x2002 /* US-606 6 Port RS232 
Serial Port 3 and 4 */
+#define BRAINBOXES_US_606_3_PID0x2003 /* US-606 6 Port RS232 
Serial Port 4 and 6 */
+#define BRAINBOXES_US_701_1_PID0x2011 /* US-701 4xRS232 1Mbaud 
Port 1 and 2 */
+#define BRAINBOXES_US_701_2_PID0x2012 /* US-701 4xRS422 1Mbaud 
Port 3 and 4 */
+#define BRAINBOXES_US_279_1_PID0x2021 /* US-279 8xRS422 1Mbaud 
Port 1 and 2 */
+#define BRAINBOXES_US_279_2_PID0x2022 /* US-279 8xRS422 1Mbaud 
Port 3 and 4 */
+#define BRAINBOXES_US_279_3_PID0x2023 /* US-279 8xRS422 1Mbaud 
Port 5 and 6 */
+#define BRAINBOXES_US_279_4_PID0x2024 /* US-279 8xRS422 1Mbaud 
Port 7 and 8 */
+#define BRAINBOXES_US_346_1_PID0x3011 /* US-346 4xRS422/485 
1Mbaud Port 1 and 2 */
+#define BRAINBOXES_US_346_2_PID0x3012 /* US-346 4xRS422/485 
1Mbaud Port 3 and 4 */
+#define BRAINBOXES_US_257_PID  0x5001 /* US-257

Re: [PATCH] USB: serial: ftdi_sio: add id for Brainboxes serial cards

2014-03-31 Thread Johan Hovold 
On Sat, Mar 29, 2014 at 08:55:11PM +, Michele Baldessari wrote:
> Custom VID/PIDs for Brainboxes cards as reported in
> https://bugzilla.redhat.com/show_bug.cgi?id=1071914

Thanks for including the remaining PIDs from the report.

There was a duplicate entry in the device-id table below, but I'll fix
that here (and also sort the defines numerically) before sending it to
Greg.

Thanks again,
Johan

> Signed-off-by: Michele Baldessari 
> ---
>  drivers/usb/serial/ftdi_sio.c | 34 ++
>  drivers/usb/serial/ftdi_sio_ids.h | 38 ++
>  2 files changed, 72 insertions(+)
> 
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index 44ab12986805..ccfa3c55212c 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -909,6 +909,40 @@ static const struct usb_device_id id_table_combined[] = {
>   { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
>   /* Cressi Devices */
>   { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
> + /* Brainbox Devices */
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
> + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
>   { } /* Terminating entry */
>  };
>  
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h 
> b/drivers/usb/serial/ftdi_sio_ids.h
> index e599fbfcde5f..84d351e70f9c 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -1326,3 +1326,41 @@
>   * Manufacturer: Cressi
>   */
>  #define FTDI_CRESSI_PID  0x87d0
> +
> +/*
> + * Product: Brainboxes devices
> + * Manufacturer: Brainboxes
> + */
> +#define BRAINBOXES_VID   0x05d1
> +#define BRAINBOXES_VX_001_PID0x1001 /* VX-001 ExpressCard 1 
> Port RS232 */
> +#define BRAINBOXES_VX_012_PID0x1002 /* VX-012 ExpressCard 2 
> Port RS232 */
> +#define BRAINBOXES_VX_023_PID0x1003 /* VX-023 ExpressCard 1 
> Port RS422/485 */
> +#define BRAINBOXES_VX_034_PID0x1004 /* VX-034 ExpressCard 2 
> Port RS422/485 */
> +#define BRAINBOXES_US_101_PID0x1011 /* US-101 1xRS232 */
> +#define BRAINBOXES_US_257_PID0x5001 /* US-257 2xRS232 1Mbaud 
> */
> +#define BRAINBOXES_US_313_PID0x6001 /* US-313 2xRS422/485 
> 1Mbaud */
> +#define BRAINBOXES_US_324_PID0x1013 /* US-324 1xRS422/485 
> 1Mbaud */
> +#define BRAINBOXES_US_357_PID0x7001 /* US_357 
> 1xRS232/422/485 */
> +#define BRAINBOXES_US_160_1_PID  0x9001 /* US-160 16xRS232 
> 1Mbaud Port 1 and 2 */
> +#define BRAINBOXES_US_160_2_PID  0x9002 /* US-160 16xRS232 
> 1Mbaud Port 3 and 4 */
> +#define BRAINBOXES_US_160_3_PID  0x9003 /* US-160 16xRS232 
> 1Mbaud Port 5 and 6 */
> +#define BRAINBOXES_US_160_4_PID  0x9004 /* US-160 16xRS232 
> 1Mbaud Port 7 and 8 */
> +#define

Re: [PATCH] USB: serial: ftdi_sio: add id for Brainboxes serial cards

2014-03-31 Thread Johan Hovold 
On Sat, Mar 29, 2014 at 08:55:11PM +, Michele Baldessari wrote:
 Custom VID/PIDs for Brainboxes cards as reported in
 https://bugzilla.redhat.com/show_bug.cgi?id=1071914

Thanks for including the remaining PIDs from the report.

There was a duplicate entry in the device-id table below, but I'll fix
that here (and also sort the defines numerically) before sending it to
Greg.

Thanks again,
Johan

 Signed-off-by: Michele Baldessari mich...@acksyn.org
 ---
  drivers/usb/serial/ftdi_sio.c | 34 ++
  drivers/usb/serial/ftdi_sio_ids.h | 38 ++
  2 files changed, 72 insertions(+)
 
 diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
 index 44ab12986805..ccfa3c55212c 100644
 --- a/drivers/usb/serial/ftdi_sio.c
 +++ b/drivers/usb/serial/ftdi_sio.c
 @@ -909,6 +909,40 @@ static const struct usb_device_id id_table_combined[] = {
   { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
   /* Cressi Devices */
   { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
 + /* Brainbox Devices */
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
 + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
   { } /* Terminating entry */
  };
  
 diff --git a/drivers/usb/serial/ftdi_sio_ids.h 
 b/drivers/usb/serial/ftdi_sio_ids.h
 index e599fbfcde5f..84d351e70f9c 100644
 --- a/drivers/usb/serial/ftdi_sio_ids.h
 +++ b/drivers/usb/serial/ftdi_sio_ids.h
 @@ -1326,3 +1326,41 @@
   * Manufacturer: Cressi
   */
  #define FTDI_CRESSI_PID  0x87d0
 +
 +/*
 + * Product: Brainboxes devices
 + * Manufacturer: Brainboxes
 + */
 +#define BRAINBOXES_VID   0x05d1
 +#define BRAINBOXES_VX_001_PID0x1001 /* VX-001 ExpressCard 1 
 Port RS232 */
 +#define BRAINBOXES_VX_012_PID0x1002 /* VX-012 ExpressCard 2 
 Port RS232 */
 +#define BRAINBOXES_VX_023_PID0x1003 /* VX-023 ExpressCard 1 
 Port RS422/485 */
 +#define BRAINBOXES_VX_034_PID0x1004 /* VX-034 ExpressCard 2 
 Port RS422/485 */
 +#define BRAINBOXES_US_101_PID0x1011 /* US-101 1xRS232 */
 +#define BRAINBOXES_US_257_PID0x5001 /* US-257 2xRS232 1Mbaud 
 */
 +#define BRAINBOXES_US_313_PID0x6001 /* US-313 2xRS422/485 
 1Mbaud */
 +#define BRAINBOXES_US_324_PID0x1013 /* US-324 1xRS422/485 
 1Mbaud */
 +#define BRAINBOXES_US_357_PID0x7001 /* US_357 
 1xRS232/422/485 */
 +#define BRAINBOXES_US_160_1_PID  0x9001 /* US-160 16xRS232 
 1Mbaud Port 1 and 2 */
 +#define BRAINBOXES_US_160_2_PID  0x9002 /* US-160 16xRS232 
 1Mbaud Port 3 and 4 */
 +#define BRAINBOXES_US_160_3_PID  0x9003 /* US-160 16xRS232 
 1Mbaud Port 5 and 6 */
 +#define BRAINBOXES_US_160_4_PID  0x9004 /* US-160 16xRS232 
 1Mbaud Port 7 and 8 */
 +#define BRAINBOXES_US_160_5_PID  0x9005 /* US-160 16xRS232 
 1Mbaud Port 9 and 10 */

[PATCH] USB: serial: ftdi_sio: add id for Brainboxes serial cards

2014-03-31 Thread Johan Hovold 
From: Michele Baldessari mich...@acksyn.org

Custom VID/PIDs for Brainboxes cards as reported in
https://bugzilla.redhat.com/show_bug.cgi?id=1071914

Signed-off-by: Michele Baldessari mich...@acksyn.org
Cc: stable sta...@vger.kernel.org
Signed-off-by: Johan Hovold jhov...@gmail.com
---
 drivers/usb/serial/ftdi_sio.c | 33 +
 drivers/usb/serial/ftdi_sio_ids.h | 37 +
 2 files changed, 70 insertions(+)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 44ab12986805..7c6e1dedeb06 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -909,6 +909,39 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
/* Cressi Devices */
{ USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
+   /* Brainboxes Devices */
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
{ } /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio_ids.h 
b/drivers/usb/serial/ftdi_sio_ids.h
index e599fbfcde5f..993c93df6874 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1326,3 +1326,40 @@
  * Manufacturer: Cressi
  */
 #define FTDI_CRESSI_PID0x87d0
+
+/*
+ * Brainboxes devices
+ */
+#define BRAINBOXES_VID 0x05d1
+#define BRAINBOXES_VX_001_PID  0x1001 /* VX-001 ExpressCard 1 Port 
RS232 */
+#define BRAINBOXES_VX_012_PID  0x1002 /* VX-012 ExpressCard 2 Port 
RS232 */
+#define BRAINBOXES_VX_023_PID  0x1003 /* VX-023 ExpressCard 1 Port 
RS422/485 */
+#define BRAINBOXES_VX_034_PID  0x1004 /* VX-034 ExpressCard 2 Port 
RS422/485 */
+#define BRAINBOXES_US_101_PID  0x1011 /* US-101 1xRS232 */
+#define BRAINBOXES_US_324_PID  0x1013 /* US-324 1xRS422/485 1Mbaud */
+#define BRAINBOXES_US_606_1_PID0x2001 /* US-606 6 Port RS232 
Serial Port 1 and 2 */
+#define BRAINBOXES_US_606_2_PID0x2002 /* US-606 6 Port RS232 
Serial Port 3 and 4 */
+#define BRAINBOXES_US_606_3_PID0x2003 /* US-606 6 Port RS232 
Serial Port 4 and 6 */
+#define BRAINBOXES_US_701_1_PID0x2011 /* US-701 4xRS232 1Mbaud 
Port 1 and 2 */
+#define BRAINBOXES_US_701_2_PID0x2012 /* US-701 4xRS422 1Mbaud 
Port 3 and 4 */
+#define BRAINBOXES_US_279_1_PID0x2021 /* US-279 8xRS422 1Mbaud 
Port 1 and 2 */
+#define BRAINBOXES_US_279_2_PID0x2022 /* US-279 8xRS422 1Mbaud 
Port 3 and 4 */
+#define BRAINBOXES_US_279_3_PID0x2023 /* US-279 8xRS422 1Mbaud 
Port 5 and 6 */
+#define BRAINBOXES_US_279_4_PID0x2024 /* US-279 8xRS422 1Mbaud 
Port 7 and 8 */
+#define BRAINBOXES_US_346_1_PID0x3011 /* US-346 4xRS422/485 
1Mbaud Port 1 and 2 */
+#define BRAINBOXES_US_346_2_PID0x3012 /* US-346 4xRS422/485

[PATCH] USB: serial: ftdi_sio: add id for Brainboxes serial cards

2014-03-29 Thread Michele Baldessari 
Custom VID/PIDs for Brainboxes cards as reported in
https://bugzilla.redhat.com/show_bug.cgi?id=1071914

Signed-off-by: Michele Baldessari 
---
 drivers/usb/serial/ftdi_sio.c | 34 ++
 drivers/usb/serial/ftdi_sio_ids.h | 38 ++
 2 files changed, 72 insertions(+)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 44ab12986805..ccfa3c55212c 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -909,6 +909,40 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
/* Cressi Devices */
{ USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
+   /* Brainbox Devices */
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
{ } /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio_ids.h 
b/drivers/usb/serial/ftdi_sio_ids.h
index e599fbfcde5f..84d351e70f9c 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1326,3 +1326,41 @@
  * Manufacturer: Cressi
  */
 #define FTDI_CRESSI_PID0x87d0
+
+/*
+ * Product: Brainboxes devices
+ * Manufacturer: Brainboxes
+ */
+#define BRAINBOXES_VID 0x05d1
+#define BRAINBOXES_VX_001_PID  0x1001 /* VX-001 ExpressCard 1 Port 
RS232 */
+#define BRAINBOXES_VX_012_PID  0x1002 /* VX-012 ExpressCard 2 Port 
RS232 */
+#define BRAINBOXES_VX_023_PID  0x1003 /* VX-023 ExpressCard 1 Port 
RS422/485 */
+#define BRAINBOXES_VX_034_PID  0x1004 /* VX-034 ExpressCard 2 Port 
RS422/485 */
+#define BRAINBOXES_US_101_PID  0x1011 /* US-101 1xRS232 */
+#define BRAINBOXES_US_257_PID  0x5001 /* US-257 2xRS232 1Mbaud */
+#define BRAINBOXES_US_313_PID  0x6001 /* US-313 2xRS422/485 1Mbaud */
+#define BRAINBOXES_US_324_PID  0x1013 /* US-324 1xRS422/485 1Mbaud */
+#define BRAINBOXES_US_357_PID  0x7001 /* US_357 1xRS232/422/485 */
+#define BRAINBOXES_US_160_1_PID0x9001 /* US-160 16xRS232 
1Mbaud Port 1 and 2 */
+#define BRAINBOXES_US_160_2_PID0x9002 /* US-160 16xRS232 
1Mbaud Port 3 and 4 */
+#define BRAINBOXES_US_160_3_PID0x9003 /* US-160 16xRS232 
1Mbaud Port 5 and 6 */
+#define BRAINBOXES_US_160_4_PID0x9004 /* US-160 16xRS232 
1Mbaud Port 7 and 8 */
+#define BRAINBOXES_US_160_5_PID0x9005 /* US-160 16xRS232 
1Mbaud Port 9 and 10 */
+#define BRAINBOXES_US_160_6_PID0x9006 /* US-160 16xRS232 
1Mbaud Port 11 and 12 */
+#define BRAINBOXES_US_160_7_PID0x9007 /* US-160 16xRS232 
1Mbaud Port 13 and 14 */
+#define BRAINBOXES_US_160_8_PID0x9008 /* US-160 16xRS232 
1Mbaud Port 15 and 16 */
+#define BRAINBOXES_US_279_1_PID0x2021 /* US-279 8xRS422 1Mbaud 
Port 1 and 2

[PATCH] USB: serial: ftdi_sio: add id for Brainboxes serial cards

2014-03-29 Thread Michele Baldessari 
Custom VID/PIDs for Brainboxes cards as reported in
https://bugzilla.redhat.com/show_bug.cgi?id=1071914

Signed-off-by: Michele Baldessari mich...@acksyn.org
---
 drivers/usb/serial/ftdi_sio.c | 34 ++
 drivers/usb/serial/ftdi_sio_ids.h | 38 ++
 2 files changed, 72 insertions(+)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 44ab12986805..ccfa3c55212c 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -909,6 +909,40 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
/* Cressi Devices */
{ USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
+   /* Brainbox Devices */
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
+   { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
{ } /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio_ids.h 
b/drivers/usb/serial/ftdi_sio_ids.h
index e599fbfcde5f..84d351e70f9c 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1326,3 +1326,41 @@
  * Manufacturer: Cressi
  */
 #define FTDI_CRESSI_PID0x87d0
+
+/*
+ * Product: Brainboxes devices
+ * Manufacturer: Brainboxes
+ */
+#define BRAINBOXES_VID 0x05d1
+#define BRAINBOXES_VX_001_PID  0x1001 /* VX-001 ExpressCard 1 Port 
RS232 */
+#define BRAINBOXES_VX_012_PID  0x1002 /* VX-012 ExpressCard 2 Port 
RS232 */
+#define BRAINBOXES_VX_023_PID  0x1003 /* VX-023 ExpressCard 1 Port 
RS422/485 */
+#define BRAINBOXES_VX_034_PID  0x1004 /* VX-034 ExpressCard 2 Port 
RS422/485 */
+#define BRAINBOXES_US_101_PID  0x1011 /* US-101 1xRS232 */
+#define BRAINBOXES_US_257_PID  0x5001 /* US-257 2xRS232 1Mbaud */
+#define BRAINBOXES_US_313_PID  0x6001 /* US-313 2xRS422/485 1Mbaud */
+#define BRAINBOXES_US_324_PID  0x1013 /* US-324 1xRS422/485 1Mbaud */
+#define BRAINBOXES_US_357_PID  0x7001 /* US_357 1xRS232/422/485 */
+#define BRAINBOXES_US_160_1_PID0x9001 /* US-160 16xRS232 
1Mbaud Port 1 and 2 */
+#define BRAINBOXES_US_160_2_PID0x9002 /* US-160 16xRS232 
1Mbaud Port 3 and 4 */
+#define BRAINBOXES_US_160_3_PID0x9003 /* US-160 16xRS232 
1Mbaud Port 5 and 6 */
+#define BRAINBOXES_US_160_4_PID0x9004 /* US-160 16xRS232 
1Mbaud Port 7 and 8 */
+#define BRAINBOXES_US_160_5_PID0x9005 /* US-160 16xRS232 
1Mbaud Port 9 and 10 */
+#define BRAINBOXES_US_160_6_PID0x9006 /* US-160 16xRS232 
1Mbaud Port 11 and 12 */
+#define BRAINBOXES_US_160_7_PID0x9007 /* US-160 16xRS232 
1Mbaud Port 13 and 14 */
+#define BRAINBOXES_US_160_8_PID0x9008 /* US-160 16xRS232 
1Mbaud Port 15 and 16 */
+#define BRAINBOXES_US_279_1_PID0x2021 /* US-279 8xRS422