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

Commit 1befbb5e 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 HSIC PID 0x909F"

parents fb1f1c90 df03f91a

arch/arm/mach-msm/hsic_sysmon.c

+1 −0
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ static const struct usb_device_id hsic_sysmon_ids[] = { 
	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909C, 1), .driver_info = 0, },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909D, 1), .driver_info = 0, },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909E, 2), .driver_info = 0, },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909F, 1), .driver_info = 0, },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x90A0, 1), .driver_info = 0, },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x90A4, 2), .driver_info = 0, },

drivers/net/usb/rmnet_usb_data.c

+12 −4
Original line number Diff line number Diff line
@@ -712,7 +712,8 @@ static const struct usb_device_id vidpids[] = { 
	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x904c, 8),

	.driver_info = (unsigned long)&rmnet_info,

	},

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x9075, 6), /*mux over hsic mdm*/

	/* mux over hsic mdm */

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x9075, 6),

	.driver_info = (unsigned long)&rmnet_info,

	},

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x908E, 8),
@@ -730,13 +731,20 @@ static const struct usb_device_id vidpids[] = { 
	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x9079, 8),

	.driver_info = (unsigned long)&rmnet_usb_info,

	},

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x908A, 6), /*mux over hsic mdm*/

	/* mux over hsic mdm */

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x908A, 6),

	.driver_info = (unsigned long)&rmnet_info,

	},

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x90A0, 6), /*mux over hsic mdm*/

	/* mux over hsic mdm */

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x909F, 6),

	.driver_info = (unsigned long)&rmnet_info,

	},

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x90A4, 8), /*mux over hsic mdm*/

	/* mux over hsic mdm */

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x90A0, 6),

	.driver_info = (unsigned long)&rmnet_info,

	},

	/* mux over hsic mdm */

	{ USB_DEVICE_INTERFACE_NUMBER(0x05c6, 0x90A4, 8),

	.driver_info = (unsigned long)&rmnet_info,

	},

drivers/usb/misc/diag_bridge.c

+2 −0
Original line number Diff line number Diff line
@@ -603,6 +603,8 @@ static const struct usb_device_id diag_bridge_ids[] = { 
	/* 909E, ifc#1 refers to diag client interface */

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909E, 1),

	.driver_info =  DEV_ID(1), },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909F, 0),

	.driver_info =	DEV_ID(0), },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x90A0, 0),

	.driver_info =  DEV_ID(0), },

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x90A4, 0),

drivers/usb/misc/ks_bridge.c

+3 −0
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ static const struct usb_device_id ksb_usb_ids[] = { 
	.driver_info = (unsigned long)&ksb_efs_hsic_dev, },

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

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

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

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

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

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

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x90A4, 3),
@@ -666,6 +668,7 @@ ksb_usb_probe(struct usb_interface *ifc, const struct usb_device_id *id) 
	case 0x909C:

	case 0x909D:

	case 0x909E:

	case 0x909F:

	case 0x90A4:

		ksb = __ksb[EFS_HSIC_BRIDGE_INDEX];

		break;

drivers/usb/misc/mdm_data_bridge.c

+6 −0
Original line number Diff line number Diff line
@@ -1151,6 +1151,12 @@ static const struct usb_device_id bridge_ids[] = { 
	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909E, 4),

	.driver_info = (unsigned long)qdss_hsic_bridge_names,

	},

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

	.driver_info = (unsigned long)serial_hsic_bridge_names,

	},

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x909F, 5),

	.driver_info = (unsigned long)rmnet_hsic_bridge_names,

	},

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

	.driver_info = (unsigned long)serial_hsic_bridge_names,

	},