Commit 592d32cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: musb: tusb6010: fix compile error with n8x0_defconfig
  USB: FTDI: Add support for the RT System VX-7 radio programming cable
  USB: add quirk for Broadcom BT dongle
  USB: usb-storage: fix initializations of urb fields
  USB: xhci: Set Mult field in endpoint context correctly.
  USB: sisusbvga: Fix for USB 3.0
  USB: adds Artisman USB dongle to list of quirky devices
  USB: xhci: Set EP0 dequeue ptr after reset of configured device.
  USB: Fix USB3.0 Port Speed Downgrade after port reset
  USB: xHCI: Fix another bug in link TRB activation change.
  USB: option: Add support for AMOI Skypephone S2
  USB: New PIDs for Qualcomm gobi 2000 (qcserial)
  USB: ftdi_sio: support for Signalyzer tools based on FTDI chips
  USB: s3c2410_udc: be aware of connected gadget driver
  USB: Expose vendor-specific ACM channel on Nokia 5230
  USB: Add PID for Sierra 250U to drivers/usb/serial/sierra.c
  USB: option: add support for 1da5:4518
parents 4afb93b4 2b795ea0

drivers/usb/class/cdc-acm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1596,6 +1596,7 @@ static const struct usb_device_id acm_ids[] = { 
	{ NOKIA_PCSUITE_ACM_INFO(0x00e9), }, /* Nokia 5320 XpressMusic */

	{ NOKIA_PCSUITE_ACM_INFO(0x00e9), }, /* Nokia 5320 XpressMusic */

	{ NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */

	{ NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */

	{ NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */

	{ NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */

	{ NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */





	/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */

	/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */

drivers/usb/core/hub.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1982,6 +1982,8 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1, 
		    (portstatus & USB_PORT_STAT_ENABLE)) {

		    (portstatus & USB_PORT_STAT_ENABLE)) {

			if (hub_is_wusb(hub))

			if (hub_is_wusb(hub))

				udev->speed = USB_SPEED_WIRELESS;

				udev->speed = USB_SPEED_WIRELESS;

			else if (portstatus & USB_PORT_STAT_SUPER_SPEED)

				udev->speed = USB_SPEED_SUPER;

			else if (portstatus & USB_PORT_STAT_HIGH_SPEED)

			else if (portstatus & USB_PORT_STAT_HIGH_SPEED)

				udev->speed = USB_SPEED_HIGH;

				udev->speed = USB_SPEED_HIGH;

			else if (portstatus & USB_PORT_STAT_LOW_SPEED)

			else if (portstatus & USB_PORT_STAT_LOW_SPEED)

drivers/usb/core/quirks.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Philips PSC805 audio device */

	/* Philips PSC805 audio device */

	{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },





	/* Artisman Watchdog Dongle */

	{ USB_DEVICE(0x04b4, 0x0526), .driver_info =

			USB_QUIRK_CONFIG_INTF_STRINGS },



	/* Roland SC-8820 */

	/* Roland SC-8820 */

	{ USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
@@ -64,6 +68,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */

	/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */

	{ USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },

	{ USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },





	/* Broadcom BCM92035DGROM BT dongle */

	{ USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Action Semiconductor flash disk */

	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

			USB_QUIRK_STRING_FETCH_255 },

			USB_QUIRK_STRING_FETCH_255 },

drivers/usb/gadget/s3c2410_udc.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -735,6 +735,10 @@ static void s3c2410_udc_handle_ep0_idle(struct s3c2410_udc *dev, 
	else

	else

		dev->ep0state = EP0_OUT_DATA_PHASE;

		dev->ep0state = EP0_OUT_DATA_PHASE;





	if (!dev->driver)

		return;



	/* deliver the request to the gadget driver */

	ret = dev->driver->setup(&dev->gadget, crq);

	ret = dev->driver->setup(&dev->gadget, crq);

	if (ret < 0) {

	if (ret < 0) {

		if (dev->req_config) {

		if (dev->req_config) {

drivers/usb/host/xhci-mem.c

+24 −2
Original line number Original line Diff line number Diff line
@@ -835,6 +835,27 @@ fail: 
	return 0;

	return 0;

}

}





void xhci_copy_ep0_dequeue_into_input_ctx(struct xhci_hcd *xhci,

		struct usb_device *udev)

{

	struct xhci_virt_device *virt_dev;

	struct xhci_ep_ctx	*ep0_ctx;

	struct xhci_ring	*ep_ring;



	virt_dev = xhci->devs[udev->slot_id];

	ep0_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, 0);

	ep_ring = virt_dev->eps[0].ring;

	/*

	 * FIXME we don't keep track of the dequeue pointer very well after a

	 * Set TR dequeue pointer, so we're setting the dequeue pointer of the

	 * host to our enqueue pointer.  This should only be called after a

	 * configured device has reset, so all control transfers should have

	 * been completed or cancelled before the reset.

	 */

	ep0_ctx->deq = xhci_trb_virt_to_dma(ep_ring->enq_seg, ep_ring->enqueue);

	ep0_ctx->deq |= ep_ring->cycle_state;

}



/* Setup an xHCI virtual device for a Set Address command */

/* Setup an xHCI virtual device for a Set Address command */

int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *udev)

int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *udev)

{

{
@@ -1002,7 +1023,7 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev, 
	return EP_INTERVAL(interval);

	return EP_INTERVAL(interval);

}

}





/* The "Mult" field in the endpoint context is only set for SuperSpeed devices.

/* The "Mult" field in the endpoint context is only set for SuperSpeed isoc eps.

 * High speed endpoint descriptors can define "the number of additional

 * High speed endpoint descriptors can define "the number of additional

 * transaction opportunities per microframe", but that goes in the Max Burst

 * transaction opportunities per microframe", but that goes in the Max Burst

 * endpoint context field.

 * endpoint context field.
@@ -1010,7 +1031,8 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev, 
static inline u32 xhci_get_endpoint_mult(struct usb_device *udev,

static inline u32 xhci_get_endpoint_mult(struct usb_device *udev,

		struct usb_host_endpoint *ep)

		struct usb_host_endpoint *ep)

{

{

	if (udev->speed != USB_SPEED_SUPER)

	if (udev->speed != USB_SPEED_SUPER ||

			!usb_endpoint_xfer_isoc(&ep->desc))

		return 0;

		return 0;

	return ep->ss_ep_comp.bmAttributes;

	return ep->ss_ep_comp.bmAttributes;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE