diff options
author | Doug Goldstein <cardoe@cardoe.com> | 2015-03-23 21:34:48 -0400 |
---|---|---|
committer | Johan Hovold <johan@kernel.org> | 2015-03-25 10:32:53 -0400 |
commit | b229a0f840f774d29d8fedbf5deb344ca36b7f1a (patch) | |
tree | becc7daaa92eccc3abffd5443a837251f5b5ff30 | |
parent | 5e71fc8629cefae5f3c1a4f498de3fe4f631924a (diff) |
USB: ftdi_sio: Use jtag quirk for SNAP Connect E10
This patch uses the existing CALAO Systems ftdi_8u2232c_probe in order
to avoid attaching a TTY to the JTAG port as this board is based on the
CALAO Systems reference design and needs the same fix up.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
CC: stable <stable@vger.kernel.org>
[johan: clean up probe logic ]
Signed-off-by: Johan Hovold <johan@kernel.org>
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 130b354a8fd7..8eb68a31cab6 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1884,8 +1884,12 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial) | |||
1884 | { | 1884 | { |
1885 | struct usb_device *udev = serial->dev; | 1885 | struct usb_device *udev = serial->dev; |
1886 | 1886 | ||
1887 | if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) || | 1887 | if (udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) |
1888 | (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2"))) | 1888 | return ftdi_jtag_probe(serial); |
1889 | |||
1890 | if (udev->product && | ||
1891 | (!strcmp(udev->product, "BeagleBone/XDS100V2") || | ||
1892 | !strcmp(udev->product, "SNAP Connect E10"))) | ||
1889 | return ftdi_jtag_probe(serial); | 1893 | return ftdi_jtag_probe(serial); |
1890 | 1894 | ||
1891 | return 0; | 1895 | return 0; |