[PATCH 2/2] USB:ftdi_sio: enable two UART ports on ST Microconnect Lite

2013-04-24 Thread Adrian Thomasset 
The FT4232H used in the ST Micro Connect Lite has four hi-speed UART ports.
The first two ports are reserved for the JTAG interface.

We enable by default ports 2 and 3 as UARTs (where port 2 is a
conventional RS-232 UART)

Signed-off-by: Adrian Thomasset adrian.thomas...@st.com
---
 drivers/usb/serial/ftdi_sio.c | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 6be5853..f17ef04 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1794,20 +1794,24 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
 }
 
 /*
- * First and second port on STMCLiteadaptors is reserved for JTAG interface
- * and the forth port for pio
+ * First two ports on JTAG adaptors using an FT4232 such as 
STMicroelectronics's
+ * ST Micro Connect Lite are reserved for JTAG or other non-UART interfaces and
+ * can be accessed from userspace.
+ * The next two ports are enabled as UARTs by default, where port 2 is
+ * a conventional RS-232 UART.
  */
 static int ftdi_stmclite_probe(struct usb_serial *serial)
 {
struct usb_device *udev = serial-dev;
struct usb_interface *interface = serial-interface;
 
-   if (interface == udev-actconfig-interface[2])
-   return 0;
-
-   dev_info(udev-dev, Ignoring serial port reserved for JTAG\n);
+   if (interface == udev-actconfig-interface[0] ||
+   interface == udev-actconfig-interface[1]) {
+   dev_info(udev-dev, Ignoring serial port reserved for 
JTAG\n);
+   return -ENODEV;
+   }
 
-   return -ENODEV;
+   return 0;
 }
 
 /*
-- 
1.8.1.2

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] USB:ftdi_sio: enable two UART ports on ST Microconnect Lite

2013-04-23 Thread Adrian Thomasset 
The FT4232H used in the ST Micro Connect Lite has four hi-speed UART ports.
The first two ports are reserved for the JTAG interface.

We enable by default ports 2 and 3 as UARTs (where port 2 is a
conventional RS-232 UART)

Signed-off-by: Adrian Thomasset adrian.thomas...@st.com
---
 drivers/usb/serial/ftdi_sio.c | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 6be5853..6553920 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1794,20 +1794,24 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
 }
 
 /*
- * First and second port on STMCLiteadaptors is reserved for JTAG interface
- * and the forth port for pio
+ * First two ports on JTAG adaptors using an FT4232 such as 
STMicroelectronics's
+ * ST Micro Connect Lite are reserved for JTAG or other non-UART interfaces and
+ * can be accessed from userspace.
+ * The next two ports are enabled as UARTs by default, where port 2 is
+ * a conventional RS-232 UART.
  */
 static int ftdi_stmclite_probe(struct usb_serial *serial)
 {
struct usb_device *udev = serial-dev;
struct usb_interface *interface = serial-interface;
 
-   if (interface == udev-actconfig-interface[2])
-   return 0;
-
+   if (interface == udev-actconfig-interface[0] ||
+   interface == udev-actconfig-interface[1]) {
dev_info(udev-dev, Ignoring serial port reserved for JTAG\n);
-
return -ENODEV;
+   }
+
+   return 0;
 }
 
 /*
-- 
1.8.1.2

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] USB:ftdi_sio: enable two UART ports on ST Microconnect Lite

2013-04-23 Thread Greg KH 
On Tue, Apr 23, 2013 at 12:46:30PM +0100, Adrian Thomasset wrote:
 The FT4232H used in the ST Micro Connect Lite has four hi-speed UART ports.
 The first two ports are reserved for the JTAG interface.
 
 We enable by default ports 2 and 3 as UARTs (where port 2 is a
 conventional RS-232 UART)
 
 Signed-off-by: Adrian Thomasset adrian.thomas...@st.com
 ---
  drivers/usb/serial/ftdi_sio.c | 16 ++--
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
 index 6be5853..6553920 100644
 --- a/drivers/usb/serial/ftdi_sio.c
 +++ b/drivers/usb/serial/ftdi_sio.c
 @@ -1794,20 +1794,24 @@ static int ftdi_8u2232c_probe(struct usb_serial 
 *serial)
  }
  
  /*
 - * First and second port on STMCLiteadaptors is reserved for JTAG interface
 - * and the forth port for pio
 + * First two ports on JTAG adaptors using an FT4232 such as 
 STMicroelectronics's
 + * ST Micro Connect Lite are reserved for JTAG or other non-UART interfaces 
 and
 + * can be accessed from userspace.
 + * The next two ports are enabled as UARTs by default, where port 2 is
 + * a conventional RS-232 UART.
   */
  static int ftdi_stmclite_probe(struct usb_serial *serial)
  {
   struct usb_device *udev = serial-dev;
   struct usb_interface *interface = serial-interface;
  
 - if (interface == udev-actconfig-interface[2])
 - return 0;
 -
 + if (interface == udev-actconfig-interface[0] ||
 + interface == udev-actconfig-interface[1]) {
   dev_info(udev-dev, Ignoring serial port reserved for JTAG\n);
 -
   return -ENODEV;
 + }
 +

You didn't run this patch through 'scripts/checkpatch.pl', did you?
Please fix up the formatting errors and resend.

thanks,

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] USB:ftdi_sio: enable two UART ports on ST Microconnect Lite

2013-04-23 Thread Sergei Shtylyov 

Hello.

On 04/23/2013 03:46 PM, Adrian Thomasset wrote:


The FT4232H used in the ST Micro Connect Lite has four hi-speed UART ports.
The first two ports are reserved for the JTAG interface.

We enable by default ports 2 and 3 as UARTs (where port 2 is a
conventional RS-232 UART)

Signed-off-by: Adrian Thomasset adrian.thomas...@st.com
---
  drivers/usb/serial/ftdi_sio.c | 16 ++--
  1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 6be5853..6553920 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1794,20 +1794,24 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
  }
  
  /*

- * First and second port on STMCLiteadaptors is reserved for JTAG interface
- * and the forth port for pio
+ * First two ports on JTAG adaptors using an FT4232 such as 
STMicroelectronics's
+ * ST Micro Connect Lite are reserved for JTAG or other non-UART interfaces and
+ * can be accessed from userspace.
+ * The next two ports are enabled as UARTs by default, where port 2 is
+ * a conventional RS-232 UART.
   */
  static int ftdi_stmclite_probe(struct usb_serial *serial)
  {
struct usb_device *udev = serial-dev;
struct usb_interface *interface = serial-interface;
  
-	if (interface == udev-actconfig-interface[2])

-   return 0;
-
+   if (interface == udev-actconfig-interface[0] ||
+   interface == udev-actconfig-interface[1]) {
dev_info(udev-dev, Ignoring serial port reserved for JTAG\n);
-
return -ENODEV;


   You should indent the code inside {}.


+   }
+
+   return 0;
  }
  
  /*


WBR, Sergei

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html