diff options
| author | Doug Goldstein <cardoe@cardoe.com> | 2015-03-23 20:34:48 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-22 08:58:37 +0200 |
| commit | 708d0b8820cbf11df7a7dc2003c950c733bad2b6 (patch) | |
| tree | 468abadc1049ec9ce0e0a4e51452179cb861db41 /drivers | |
| parent | 4b54431d13031c3eec8102859e3413b06e322569 (diff) | |
| download | lwn-708d0b8820cbf11df7a7dc2003c950c733bad2b6.tar.gz lwn-708d0b8820cbf11df7a7dc2003c950c733bad2b6.zip | |
USB: ftdi_sio: Use jtag quirk for SNAP Connect E10
commit b229a0f840f774d29d8fedbf5deb344ca36b7f1a upstream.
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>
[johan: clean up probe logic ]
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
| -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 16c6316d8d49..cc436511ac76 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1906,8 +1906,12 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial) { struct usb_device *udev = serial->dev; - if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) || - (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2"))) + if (udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) + return ftdi_jtag_probe(serial); + + if (udev->product && + (!strcmp(udev->product, "BeagleBone/XDS100V2") || + !strcmp(udev->product, "SNAP Connect E10"))) return ftdi_jtag_probe(serial); return 0; |