diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-16 19:38:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-16 19:38:01 +0300 |
| commit | 0df8a3dbacb585bb9c8b2e55de43c6aac9d86488 (patch) | |
| tree | 265a5ee634305b386ead7421e6669800e5044cc7 /drivers/usb/serial/upd78f0730.c | |
| parent | 53b7f7b53d83727075c01f57f813fc141d53c3d5 (diff) | |
| parent | beabdc3cd3e3ef9a56b62ee0e0b0663edacd5264 (diff) | |
| download | linux-0df8a3dbacb585bb9c8b2e55de43c6aac9d86488.tar.xz | |
Merge tag 'usb-serial-4.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for v4.11-rc1 part 2
Here's one more device id for the new upd78f0730 driver and three
clean-up patches that are mostly moving some code around.
All have been in linux-next with no reported issues.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/upd78f0730.c')
| -rw-r--r-- | drivers/usb/serial/upd78f0730.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/serial/upd78f0730.c b/drivers/usb/serial/upd78f0730.c index 55b9a18b6c38..a028dd2310c9 100644 --- a/drivers/usb/serial/upd78f0730.c +++ b/drivers/usb/serial/upd78f0730.c @@ -17,7 +17,7 @@ * - stop bits: 1 or 2 * - parity: even, odd or none * - flow control: none - * - baud rates: 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200 + * - baud rates: 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 153600 * - signals: DTR, RTS and BREAK */ @@ -32,8 +32,9 @@ #define DRIVER_AUTHOR "Maksim Salau <maksim.salau@gmail.com>" static const struct usb_device_id id_table[] = { - { USB_DEVICE(0x045B, 0x0212) }, /* YRPBRL78G13, YRPBRL78G14 */ { USB_DEVICE(0x0409, 0x0063) }, /* V850ESJX3-STICK */ + { USB_DEVICE(0x045B, 0x0212) }, /* YRPBRL78G13, YRPBRL78G14 */ + { USB_DEVICE(0x064B, 0x7825) }, /* Analog Devices EVAL-ADXL362Z-DB */ {} }; @@ -288,7 +289,7 @@ static speed_t upd78f0730_get_baud_rate(struct tty_struct *tty) { const speed_t baud_rate = tty_get_baud_rate(tty); const speed_t supported[] = { - 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200 + 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 153600 }; int i; |