aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorHakan Kvist <hakan.kvist@sonyericsson.com>2011-10-03 07:41:15 -0400
committerHerton Ronaldo Krzesinski <herton.krzesinski@canonical.com>2011-11-21 12:54:55 -0500
commita2a358fc6e2837fd65f8d0fc9e00e0d3ae8685de (patch)
treea5b29faa3998f94645c5844ef20a1734f73f5b67 /drivers/usb
parent1dfa99fb92213f331ed6704e9f5efafbc0f14a66 (diff)
USB: ftdi_sio: add PID for Sony Ericsson Urban
BugLink: http://bugs.launchpad.net/bugs/890952 commit 74bdf22b5c3858b06af46f19d05c23e76c40a3bb upstream. Add PID 0xfc8a, 0xfc8b for device Sony Ericsson Urban Signed-off-by: Hakan Kvist <hakan.kvist@sonyericsson.com> Signed-off-by: Oskar Andero <oskar.andero@sonyericsson.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f968a3debf1..1a2a2f5c46f 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -206,6 +206,8 @@ static struct usb_device_id id_table_combined [] = {
206 { USB_DEVICE(FTDI_VID, FTDI_XF_640_PID) }, 206 { USB_DEVICE(FTDI_VID, FTDI_XF_640_PID) },
207 { USB_DEVICE(FTDI_VID, FTDI_XF_642_PID) }, 207 { USB_DEVICE(FTDI_VID, FTDI_XF_642_PID) },
208 { USB_DEVICE(FTDI_VID, FTDI_DSS20_PID) }, 208 { USB_DEVICE(FTDI_VID, FTDI_DSS20_PID) },
209 { USB_DEVICE(FTDI_VID, FTDI_URBAN_0_PID) },
210 { USB_DEVICE(FTDI_VID, FTDI_URBAN_1_PID) },
209 { USB_DEVICE(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID) }, 211 { USB_DEVICE(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID) },
210 { USB_DEVICE(FTDI_VID, FTDI_VNHCPCUSB_D_PID) }, 212 { USB_DEVICE(FTDI_VID, FTDI_VNHCPCUSB_D_PID) },
211 { USB_DEVICE(FTDI_VID, FTDI_MTXORB_0_PID) }, 213 { USB_DEVICE(FTDI_VID, FTDI_MTXORB_0_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 19156d1049f..4519f9f86d7 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -420,9 +420,11 @@
420#define PROTEGO_SPECIAL_4 0xFC73 /* special/unknown device */ 420#define PROTEGO_SPECIAL_4 0xFC73 /* special/unknown device */
421 421
422/* 422/*
423 * DSS-20 Sync Station for Sony Ericsson P800 423 * Sony Ericsson product ids
424 */ 424 */
425#define FTDI_DSS20_PID 0xFC82 425#define FTDI_DSS20_PID 0xFC82 /* DSS-20 Sync Station for Sony Ericsson P800 */
426#define FTDI_URBAN_0_PID 0xFC8A /* Sony Ericsson Urban, uart #0 */
427#define FTDI_URBAN_1_PID 0xFC8B /* Sony Ericsson Urban, uart #1 */
426 428
427/* www.irtrans.de device */ 429/* www.irtrans.de device */
428#define FTDI_IRTRANS_PID 0xFC60 /* Product Id */ 430#define FTDI_IRTRANS_PID 0xFC60 /* Product Id */