[PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[Marek Vasut]

This development kit has an FT4232 on it with a custom USB VID/PID.
The FT4232 provides four UARTs, but only two are used. The UART 0
is used by the FlashPro5 programmer and UART 2 is connected to the
SmartFusion2 CortexM3 SoC UART port.

Note that the USB VID is registered to Actel according to Linux USB
VID database, but that was acquired by Microsemi.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: stable <stable@vger.kernel.org>
Cc: Johan Hovold <johan@kernel.org>
---
 drivers/usb/serial/ftdi_sio.c     |  1 +
 drivers/usb/serial/ftdi_sio_ids.h | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index c98cf10be5af..14f0fb34f655 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -873,6 +873,7 @@ static const struct usb_device_id id_table_combined[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID,
 					USB_CLASS_VENDOR_SPEC,
 					USB_SUBCLASS_VENDOR_SPEC, 0x00) },
+	{ USB_DEVICE(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID) },
 	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
 	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 168ccb03ce08..a9d538d18344 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -627,6 +627,16 @@
 #define MICROCHIP_USB_BOARD_PID	0x000A /* CDC RS-232 Emulation Demo */
 
 /*
+ * Microsemi/Arrow SF2PLUS Dev Kit
+ *
+ * This board has an FT4232 on it which provides four UART ports.
+ * UART 0 is used by the FlashPro5 programmer, UART 2 is connected
+ * to the UART of an CortexM3 SoC-FPGA on the board.
+ */
+#define ACTEL_VID				0x1514
+#define MICROSEMI_ARROW_SF2PLUS_BOARD_PID	0x2008
+
+/*
  * RATOC REX-USB60F
  */
 #define RATOC_VENDOR_ID		0x0584
-- 
2.11.0

Re: [PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[Johan Hovold]

[+CC: linux-usb]

Always make sure to CC linux-usb for USB patches.

On Fri, Feb 10, 2017 at 05:16:12PM +0100, Marek Vasut wrote:
> This development kit has an FT4232 on it with a custom USB VID/PID.
> The FT4232 provides four UARTs, but only two are used. The UART 0
> is used by the FlashPro5 programmer and UART 2 is connected to the
> SmartFusion2 CortexM3 SoC UART port.

Don't you want to use the "jtag" quirk for this one then to prevent the
driver from binding to interface 0? Or do you still need this interface
to be accessible as a tty device?

> Note that the USB VID is registered to Actel according to Linux USB
> VID database, but that was acquired by Microsemi.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: stable <stable@vger.kernel.org>
> Cc: Johan Hovold <johan@kernel.org>
> ---
>  drivers/usb/serial/ftdi_sio.c     |  1 +
>  drivers/usb/serial/ftdi_sio_ids.h | 10 ++++++++++
>  2 files changed, 11 insertions(+)
> 
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index c98cf10be5af..14f0fb34f655 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -873,6 +873,7 @@ static const struct usb_device_id id_table_combined[] = {
>  	{ USB_DEVICE_AND_INTERFACE_INFO(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID,
>  					USB_CLASS_VENDOR_SPEC,
>  					USB_SUBCLASS_VENDOR_SPEC, 0x00) },
> +	{ USB_DEVICE(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID) },
>  	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
>  	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
>  		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> index 168ccb03ce08..a9d538d18344 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -627,6 +627,16 @@
>  #define MICROCHIP_USB_BOARD_PID	0x000A /* CDC RS-232 Emulation Demo */
>  
>  /*
> + * Microsemi/Arrow SF2PLUS Dev Kit
> + *
> + * This board has an FT4232 on it which provides four UART ports.
> + * UART 0 is used by the FlashPro5 programmer, UART 2 is connected
> + * to the UART of an CortexM3 SoC-FPGA on the board.
> + */
> +#define ACTEL_VID				0x1514
> +#define MICROSEMI_ARROW_SF2PLUS_BOARD_PID	0x2008
> +

Please place this before the Olimex section to try to maintain some
order based on VID.

> +/*
>   * RATOC REX-USB60F
>   */
>  #define RATOC_VENDOR_ID		0x0584

Thanks,
Johan

Re: [PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[Marek Vasut]

On 02/13/2017 10:29 AM, Johan Hovold wrote:
> [+CC: linux-usb]
> 
> Always make sure to CC linux-usb for USB patches.

Got it

> On Fri, Feb 10, 2017 at 05:16:12PM +0100, Marek Vasut wrote:
>> This development kit has an FT4232 on it with a custom USB VID/PID.
>> The FT4232 provides four UARTs, but only two are used. The UART 0
>> is used by the FlashPro5 programmer and UART 2 is connected to the
>> SmartFusion2 CortexM3 SoC UART port.
> 
> Don't you want to use the "jtag" quirk for this one then to prevent the
> driver from binding to interface 0? Or do you still need this interface
> to be accessible as a tty device?

I will check that next week as I don't have access to the HW this week.

>> Note that the USB VID is registered to Actel according to Linux USB
>> VID database, but that was acquired by Microsemi.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: stable <stable@vger.kernel.org>
>> Cc: Johan Hovold <johan@kernel.org>
>> ---
>>  drivers/usb/serial/ftdi_sio.c     |  1 +
>>  drivers/usb/serial/ftdi_sio_ids.h | 10 ++++++++++
>>  2 files changed, 11 insertions(+)
>>
>> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
>> index c98cf10be5af..14f0fb34f655 100644
>> --- a/drivers/usb/serial/ftdi_sio.c
>> +++ b/drivers/usb/serial/ftdi_sio.c
>> @@ -873,6 +873,7 @@ static const struct usb_device_id id_table_combined[] = {
>>  	{ USB_DEVICE_AND_INTERFACE_INFO(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID,
>>  					USB_CLASS_VENDOR_SPEC,
>>  					USB_SUBCLASS_VENDOR_SPEC, 0x00) },
>> +	{ USB_DEVICE(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID) },
>>  	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
>>  	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
>>  		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
>> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
>> index 168ccb03ce08..a9d538d18344 100644
>> --- a/drivers/usb/serial/ftdi_sio_ids.h
>> +++ b/drivers/usb/serial/ftdi_sio_ids.h
>> @@ -627,6 +627,16 @@
>>  #define MICROCHIP_USB_BOARD_PID	0x000A /* CDC RS-232 Emulation Demo */
>>  
>>  /*
>> + * Microsemi/Arrow SF2PLUS Dev Kit
>> + *
>> + * This board has an FT4232 on it which provides four UART ports.
>> + * UART 0 is used by the FlashPro5 programmer, UART 2 is connected
>> + * to the UART of an CortexM3 SoC-FPGA on the board.
>> + */
>> +#define ACTEL_VID				0x1514
>> +#define MICROSEMI_ARROW_SF2PLUS_BOARD_PID	0x2008
>> +
> 
> Please place this before the Olimex section to try to maintain some
> order based on VID.

So ordering of the file is based on the VIDs , got it and done.

>> +/*
>>   * RATOC REX-USB60F
>>   */
>>  #define RATOC_VENDOR_ID		0x0584
> 
> Thanks,
> Johan
> 


-- 
Best regards,
Marek Vasut

Re: [PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[Marek Vasut]

On 02/13/2017 10:29 AM, Johan Hovold wrote:
> [+CC: linux-usb]
> 
> Always make sure to CC linux-usb for USB patches.
> 
> On Fri, Feb 10, 2017 at 05:16:12PM +0100, Marek Vasut wrote:
>> This development kit has an FT4232 on it with a custom USB VID/PID.
>> The FT4232 provides four UARTs, but only two are used. The UART 0
>> is used by the FlashPro5 programmer and UART 2 is connected to the
>> SmartFusion2 CortexM3 SoC UART port.
> 
> Don't you want to use the "jtag" quirk for this one then to prevent the
> driver from binding to interface 0? Or do you still need this interface
> to be accessible as a tty device?

I just got the programmer working and yes, I need the JTAG quirk, thanks
for pointing that out. V2 is out.

NOTE that the MS Libero software experience on Linux is really abysmal,
neither the flashpro5 or flashpro express are usable, one has to use the
inobvious "configure programmer" in the libero gui after the synthesis
was done to make the programmer usable. And that's not the only
inobvious thing when it comes to Microsemi ... :(

>> Note that the USB VID is registered to Actel according to Linux USB
>> VID database, but that was acquired by Microsemi.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: stable <stable@vger.kernel.org>
>> Cc: Johan Hovold <johan@kernel.org>
>> ---
>>  drivers/usb/serial/ftdi_sio.c     |  1 +
>>  drivers/usb/serial/ftdi_sio_ids.h | 10 ++++++++++
>>  2 files changed, 11 insertions(+)
>>
>> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
>> index c98cf10be5af..14f0fb34f655 100644
>> --- a/drivers/usb/serial/ftdi_sio.c
>> +++ b/drivers/usb/serial/ftdi_sio.c
>> @@ -873,6 +873,7 @@ static const struct usb_device_id id_table_combined[] = {
>>  	{ USB_DEVICE_AND_INTERFACE_INFO(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID,
>>  					USB_CLASS_VENDOR_SPEC,
>>  					USB_SUBCLASS_VENDOR_SPEC, 0x00) },
>> +	{ USB_DEVICE(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID) },
>>  	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
>>  	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
>>  		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
>> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
>> index 168ccb03ce08..a9d538d18344 100644
>> --- a/drivers/usb/serial/ftdi_sio_ids.h
>> +++ b/drivers/usb/serial/ftdi_sio_ids.h
>> @@ -627,6 +627,16 @@
>>  #define MICROCHIP_USB_BOARD_PID	0x000A /* CDC RS-232 Emulation Demo */
>>  
>>  /*
>> + * Microsemi/Arrow SF2PLUS Dev Kit
>> + *
>> + * This board has an FT4232 on it which provides four UART ports.
>> + * UART 0 is used by the FlashPro5 programmer, UART 2 is connected
>> + * to the UART of an CortexM3 SoC-FPGA on the board.
>> + */
>> +#define ACTEL_VID				0x1514
>> +#define MICROSEMI_ARROW_SF2PLUS_BOARD_PID	0x2008
>> +
> 
> Please place this before the Olimex section to try to maintain some
> order based on VID.

Done

-- 
Best regards,
Marek Vasut

Re: [PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[Marek Vasut]

On 04/19/2017 10:00 AM, Johan Hovold wrote:
> On Tue, Apr 18, 2017 at 08:07:56PM +0200, Marek Vasut wrote:
>> This development kit has an FT4232 on it with a custom USB VID/PID.
>> The FT4232 provides four UARTs, but only two are used. The UART 0
>> is used by the FlashPro5 programmer and UART 2 is connected to the
>> SmartFusion2 CortexM3 SoC UART port.
>>
>> Note that the USB VID is registered to Actel according to Linux USB
>> VID database, but that was acquired by Microsemi.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: stable <stable@vger.kernel.org>
>> Cc: usb <linux-usb@vger.kernel.org>
>> Cc: Johan Hovold <johan@kernel.org>
>> ---
>> V2: - Move the ID in ftdi_sio_ids.h to keep it sorted by VIDs
>>     - Use the JTAG quirk to avoid binding channel 0, this is needed by
>>       the Libero software, otherwise it cannot use the programmer.
>> V3: - Remove the verbose comment
>>     - Use USB_DEVICE_INTERFACE_NUMBER() instead of the JTAG quirk
> 
> Applied for -next, thanks.

Super, thanks.

-- 
Best regards,
Marek Vasut

Re: [PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[Johan Hovold]

On Tue, Apr 18, 2017 at 08:07:56PM +0200, Marek Vasut wrote:
> This development kit has an FT4232 on it with a custom USB VID/PID.
> The FT4232 provides four UARTs, but only two are used. The UART 0
> is used by the FlashPro5 programmer and UART 2 is connected to the
> SmartFusion2 CortexM3 SoC UART port.
> 
> Note that the USB VID is registered to Actel according to Linux USB
> VID database, but that was acquired by Microsemi.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: stable <stable@vger.kernel.org>
> Cc: usb <linux-usb@vger.kernel.org>
> Cc: Johan Hovold <johan@kernel.org>
> ---
> V2: - Move the ID in ftdi_sio_ids.h to keep it sorted by VIDs
>     - Use the JTAG quirk to avoid binding channel 0, this is needed by
>       the Libero software, otherwise it cannot use the programmer.
> V3: - Remove the verbose comment
>     - Use USB_DEVICE_INTERFACE_NUMBER() instead of the JTAG quirk

Applied for -next, thanks.

Johan

[PATCH] USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit

[Marek Vasut]

This development kit has an FT4232 on it with a custom USB VID/PID.
The FT4232 provides four UARTs, but only two are used. The UART 0
is used by the FlashPro5 programmer and UART 2 is connected to the
SmartFusion2 CortexM3 SoC UART port.

Note that the USB VID is registered to Actel according to Linux USB
VID database, but that was acquired by Microsemi.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: stable <stable@vger.kernel.org>
Cc: usb <linux-usb@vger.kernel.org>
Cc: Johan Hovold <johan@kernel.org>
---
V2: - Move the ID in ftdi_sio_ids.h to keep it sorted by VIDs
    - Use the JTAG quirk to avoid binding channel 0, this is needed by
      the Libero software, otherwise it cannot use the programmer.
V3: - Remove the verbose comment
    - Use USB_DEVICE_INTERFACE_NUMBER() instead of the JTAG quirk
---
 drivers/usb/serial/ftdi_sio.c     | 1 +
 drivers/usb/serial/ftdi_sio_ids.h | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 80c6d3deb80d..91a4d7346549 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -873,6 +873,7 @@ static const struct usb_device_id id_table_combined[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID,
 					USB_CLASS_VENDOR_SPEC,
 					USB_SUBCLASS_VENDOR_SPEC, 0x00) },
+	{ USB_DEVICE_INTERFACE_NUMBER(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID, 2) },
 	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
 	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 168ccb03ce08..58cf17d362c5 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -877,6 +877,10 @@
 #define	FIC_VID			0x1457
 #define	FIC_NEO1973_DEBUG_PID	0x5118
 
+/* Microsemi/Arrow SF2PLUS Dev Kit */
+#define ACTEL_VID				0x1514
+#define MICROSEMI_ARROW_SF2PLUS_BOARD_PID	0x2008
+
 /* Olimex */
 #define OLIMEX_VID			0x15BA
 #define OLIMEX_ARM_USB_OCD_PID		0x0003
-- 
2.11.0