diff options
author | Алексей Крамаренко <alexeyk13@yandex.ru> | 2013-11-01 09:26:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-12 22:05:30 -0500 |
commit | a73e47ff525d2a69d61767a5928ba00937f77e1b (patch) | |
tree | fb0d3b10e9dabb964cda2268eb9d74264ecb03e7 | |
parent | 59fa93ea76e2de29910bab0a49dbb14f56b79aea (diff) |
USB: serial: ftdi_sio: add id for Z3X Box device
commit e1466ad5b1aeda303f9282463d55798d2eda218c upstream.
Custom VID/PID for Z3X Box device, popular tool for cellphone flashing.
Signed-off-by: Alexey E. Kramarenko <alexeyk13@yandex.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index b65e657c641d..aa3aed5458a6 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -906,6 +906,7 @@ static struct usb_device_id id_table_combined [] = { | |||
906 | { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) }, | 906 | { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) }, |
907 | /* Crucible Devices */ | 907 | /* Crucible Devices */ |
908 | { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) }, | 908 | { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) }, |
909 | { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) }, | ||
909 | { }, /* Optional parameter entry */ | 910 | { }, /* Optional parameter entry */ |
910 | { } /* Terminating entry */ | 911 | { } /* Terminating entry */ |
911 | }; | 912 | }; |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 1b8af461b522..a7019d1e3058 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -1307,3 +1307,9 @@ | |||
1307 | * Manufacturer: Crucible Technologies | 1307 | * Manufacturer: Crucible Technologies |
1308 | */ | 1308 | */ |
1309 | #define FTDI_CT_COMET_PID 0x8e08 | 1309 | #define FTDI_CT_COMET_PID 0x8e08 |
1310 | |||
1311 | /* | ||
1312 | * Product: Z3X Box | ||
1313 | * Manufacturer: Smart GSM Team | ||
1314 | */ | ||
1315 | #define FTDI_Z3X_PID 0x0011 | ||