summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-02-25 09:44:39 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-02-25 09:44:38 -0800
commit91221d1360f430368444b748fa448733a95c36b7 (patch)
tree72bf136269202ff5ae212233cf15c418b51882c1
parentace476d5d234e54233d8f0d2d54823fb55bba0b5 (diff)
parent64add897a31e1bf3b7c4319ac4d28453dd792a26 (diff)
Merge "usb: misc: Add support for 9902 and 9903 PIDs"
-rw-r--r--drivers/usb/misc/diag_ipc_bridge.c12
-rw-r--r--drivers/usb/misc/ks_bridge.c6
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/usb/misc/diag_ipc_bridge.c b/drivers/usb/misc/diag_ipc_bridge.c
index f369f69da6a1..780746e8e630 100644
--- a/drivers/usb/misc/diag_ipc_bridge.c
+++ b/drivers/usb/misc/diag_ipc_bridge.c
@@ -806,6 +806,18 @@ static const struct usb_device_id diag_bridge_ids[] = {
/* 9901, ifc#3 refers to IPC client interface */
{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9901, 3),
.driver_info = DEV_ID(1), },
+ /* 9902, ifc#2 refers to diag client interface */
+ { USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9902, 2),
+ .driver_info = DEV_ID(0), },
+ /* 9902, ifc#1 refers to IPC client interface */
+ { USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9902, 1),
+ .driver_info = DEV_ID(1), },
+ /* 9903, ifc#4 refers to diag client interface */
+ { USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9903, 4),
+ .driver_info = DEV_ID(0), },
+ /* 9903, ifc#3 refers to IPC client interface */
+ { USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9903, 3),
+ .driver_info = DEV_ID(1), },
{} /* terminating entry */
};
diff --git a/drivers/usb/misc/ks_bridge.c b/drivers/usb/misc/ks_bridge.c
index c6fd30349ecc..715bf840def8 100644
--- a/drivers/usb/misc/ks_bridge.c
+++ b/drivers/usb/misc/ks_bridge.c
@@ -467,6 +467,10 @@ static const struct usb_device_id ksb_usb_ids[] = {
{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x900E, 0), },
{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9900, 0), },
{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9901, 0), },
+ { USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9902, 3),
+ .driver_info = (unsigned long)&ksb_fboot_dev, },
+ { USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9903, 5),
+ .driver_info = (unsigned long)&ksb_fboot_dev, },
{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9048, 2),
.driver_info = (unsigned long)&ksb_efs_hsic_dev, },
{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x904C, 2),
@@ -724,6 +728,8 @@ ksb_usb_probe(struct usb_interface *ifc, const struct usb_device_id *id)
mdev->name = ksb->name;
break;
case 0x9008:
+ case 0x9902:
+ case 0x9903:
ksb = __ksb[bus_id];
mdev = &fbdev[bus_id];
break;