diff options
| author | Doug Goldstein <cardoe@cardoe.com> | 2015-03-23 20:34:48 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:32 +0100 |
| commit | fdb966911e4c273bdb1a7988c128f6a13d3b309d (patch) | |
| tree | fbbfd49b1248c887c61b36f919f6446e23416728 /drivers/usb | |
| parent | 2b14e138905fd23ec74ee713a490a48ea5ccac3d (diff) | |
| download | kernel_samsung_smdk4412-fdb966911e4c273bdb1a7988c128f6a13d3b309d.zip kernel_samsung_smdk4412-fdb966911e4c273bdb1a7988c128f6a13d3b309d.tar.gz kernel_samsung_smdk4412-fdb966911e4c273bdb1a7988c128f6a13d3b309d.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb')
| -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 bbb8962..e13ebb0 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1947,8 +1947,12 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial) dbg("%s", __func__); - 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; |