Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91221d13 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: misc: Add support for 9902 and 9903 PIDs"

parents ace476d5 64add897

drivers/usb/misc/diag_ipc_bridge.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -806,6 +806,18 @@ static const struct usb_device_id diag_bridge_ids[] = { 
	/* 9901, ifc#3 refers to IPC client interface */

	/* 9901, ifc#3 refers to IPC client interface */

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9901, 3),

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9901, 3),

	.driver_info =	DEV_ID(1), },

	.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 */

	{} /* terminating entry */

};

};

drivers/usb/misc/ks_bridge.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -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, 0x900E, 0), },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9900, 0), },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9900, 0), },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9901, 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),

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9048, 2),

	.driver_info = (unsigned long)&ksb_efs_hsic_dev, },

	.driver_info = (unsigned long)&ksb_efs_hsic_dev, },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x904C, 2),

	{ 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;

		mdev->name = ksb->name;

		break;

		break;

	case 0x9008:

	case 0x9008:

	case 0x9902:

	case 0x9903:

		ksb = __ksb[bus_id];

		ksb = __ksb[bus_id];

		mdev = &fbdev[bus_id];

		mdev = &fbdev[bus_id];

		break;

		break;