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

Commit a7b196ab 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: ks_bridge: Add support for 9025/901D PIDs"

parents ccf69b4b 136d4bbc

arch/arm64/configs/msm-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y 
CONFIG_USB_DWC3=y

CONFIG_USB_SERIAL=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_QTI_KS_BRIDGE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_MSM_QUSB_PHY=y

arch/arm64/configs/msm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y 
CONFIG_USB_DWC3=y

CONFIG_USB_SERIAL=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_QTI_KS_BRIDGE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_MSM_QUSB_PHY=y

drivers/usb/misc/ks_bridge.c

+14 −1
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static enum bus_id str_to_busid(const char *name) 
		return BUS_HSIC;

	if (!strncasecmp("msm_ehci_host.0", name, BUSNAME_LEN))

		return BUS_USB;

	if (!strncasecmp("xhci-hcd.0.auto", name, BUSNAME_LEN))

		return BUS_USB;



	return BUS_UNDEF;

}
@@ -456,6 +458,10 @@ static struct ksb_dev_info ksb_efs_usb_dev = { 
static const struct usb_device_id ksb_usb_ids[] = {

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9008, 0),

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

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x9025, 0),

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

	{ USB_DEVICE_INTERFACE_NUMBER(0x5c6, 0x901D, 0),

	.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),
@@ -658,7 +664,7 @@ static void ksb_start_rx_work(struct work_struct *w) 
static int

ksb_usb_probe(struct usb_interface *ifc, const struct usb_device_id *id)

{

	__u8				ifc_num;

	__u8				ifc_num, ifc_count;

	struct usb_host_interface	*ifc_desc;

	struct usb_endpoint_descriptor	*ep_desc;

	int				i;
@@ -673,6 +679,7 @@ ksb_usb_probe(struct usb_interface *ifc, const struct usb_device_id *id) 
	ifc_num = ifc->cur_altsetting->desc.bInterfaceNumber;



	udev = interface_to_usbdev(ifc);

	ifc_count = udev->actconfig->desc.bNumInterfaces;

	fbdev = mdev = (struct ksb_dev_info *)id->driver_info;



	bus_id = str_to_busid(udev->bus->bus_name);
@@ -683,6 +690,12 @@ ksb_usb_probe(struct usb_interface *ifc, const struct usb_device_id *id) 
	}



	switch (id->idProduct) {

	case 0x9025:

	case 0x901D:

		dev_dbg(&udev->dev, "ifc_count: %u\n", ifc_count);

		if (ifc_count > 1)

			return -ENODEV;

		/* fall-through */

	case 0x9008:

		ksb = __ksb[bus_id];

		mdev = &fbdev[bus_id];