Commit 783e9e8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are some small fixes and device ids for 3.15-rc4.

  All have been in linux-next just fine"

* tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: Nokia 5300 should be treated as unusual dev
  USB: Nokia 305 should be treated as unusual dev
  fsl-usb: do not test for PHY_CLK_VALID bit on controller version 1.6
  usb: storage: shuttle_usbat: fix discs being detected twice
  usb: qcserial: add a number of Dell devices
  USB: OHCI: fix problem with global suspend on ATI controllers
  usb: gadget: at91-udc: fix irq and iomem resource retrieval
  usb: phy: fsm: change "|" to "||" for condition OTG_STATE_A_WAIT_BCON at statemachine
  usb: phy: fsm: update OTG HNP state transition
parents df862f62 6ed07d45

drivers/usb/gadget/at91_udc.c

+0 −10
Original line number Diff line number Diff line
@@ -1709,16 +1709,6 @@ static int at91udc_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	if (pdev->num_resources != 2) {

		DBG("invalid num_resources\n");

		return -ENODEV;

	}

	if ((pdev->resource[0].flags != IORESOURCE_MEM)

			|| (pdev->resource[1].flags != IORESOURCE_IRQ)) {

		DBG("invalid resource type\n");

		return -ENODEV;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENXIO;

drivers/usb/host/ehci-fsl.c

+2 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd, 
		break;

	}



	if (pdata->have_sysif_regs && pdata->controller_ver &&

	if (pdata->have_sysif_regs &&

	    pdata->controller_ver > FSL_USB_VER_1_6 &&

	    (phy_mode == FSL_USB2_PHY_ULPI)) {

		/* check PHY_CLK_VALID to get phy clk valid */

		if (!(spin_event_timeout(in_be32(non_ehci + FSL_SOC_USB_CTRL) &

drivers/usb/host/ohci-hub.c

+18 −0
Original line number Diff line number Diff line
@@ -90,6 +90,24 @@ __acquires(ohci->lock) 
	dl_done_list (ohci);

	finish_unlinks (ohci, ohci_frame_no(ohci));



	/*

	 * Some controllers don't handle "global" suspend properly if

	 * there are unsuspended ports.  For these controllers, put all

	 * the enabled ports into suspend before suspending the root hub.

	 */

	if (ohci->flags & OHCI_QUIRK_GLOBAL_SUSPEND) {

		__hc32 __iomem	*portstat = ohci->regs->roothub.portstatus;

		int		i;

		unsigned	temp;



		for (i = 0; i < ohci->num_ports; (++i, ++portstat)) {

			temp = ohci_readl(ohci, portstat);

			if ((temp & (RH_PS_PES | RH_PS_PSS)) ==

					RH_PS_PES)

				ohci_writel(ohci, RH_PS_PSS, portstat);

		}

	}



	/* maybe resume can wake root hub */

	if (ohci_to_hcd(ohci)->self.root_hub->do_remote_wakeup || autostop) {

		ohci->hc_control |= OHCI_CTRL_RWE;

drivers/usb/host/ohci-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static int ohci_quirk_amd700(struct usb_hcd *hcd) 
		ohci_dbg(ohci, "enabled AMD prefetch quirk\n");

	}



	ohci->flags |= OHCI_QUIRK_GLOBAL_SUSPEND;

	return 0;

}

drivers/usb/host/ohci.h

+2 −0
Original line number Diff line number Diff line
@@ -405,6 +405,8 @@ struct ohci_hcd { 
#define	OHCI_QUIRK_HUB_POWER	0x100			/* distrust firmware power/oc setup */

#define	OHCI_QUIRK_AMD_PLL	0x200			/* AMD PLL quirk*/

#define	OHCI_QUIRK_AMD_PREFETCH	0x400			/* pre-fetch for ISO transfer */

#define	OHCI_QUIRK_GLOBAL_SUSPEND	0x800		/* must suspend ports */



	// there are also chip quirks/bugs in init logic



	struct work_struct	nec_work;	/* Worker for NEC quirk */

CRA Git | Maintained and supported by SUSTech CRA and CCSE