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

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

Merge "USB: EHCI: Add a quirk to skip the suspend during test mode selection"

parents 6c8812cc ab3e9d9d

drivers/usb/host/ehci-hub.c

+2 −2
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ static int ehci_hub_control ( 
				spin_lock_irqsave(&ehci->lock, flags);



				/* Put all enabled ports into suspend */

				while (ports--) {

				while (!ehci->no_testmode_suspend && ports--) {

					u32 __iomem *sreg =

						&ehci->regs->port_status[ports];

drivers/usb/host/ehci-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static int ehci_msm_reset(struct usb_hcd *hcd) 


	ehci->caps = USB_CAPLENGTH;

	hcd->has_tt = 1;

	ehci->no_testmode_suspend = true;



	retval = ehci_setup(hcd);

	if (retval)

drivers/usb/host/ehci-msm2.c

+1 −0
Original line number Diff line number Diff line
@@ -987,6 +987,7 @@ static int msm_ehci_reset(struct usb_hcd *hcd) 


	ehci->caps = USB_CAPLENGTH;

	hcd->has_tt = 1;

	ehci->no_testmode_suspend = true;



	retval = ehci_setup(hcd);

	if (retval)

drivers/usb/host/ehci.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ struct ehci_hcd { /* one per controller */ 
	unsigned		resume_sof_bug:1;/*Chip Idea HC*/

	unsigned		reset_sof_bug:1; /*Chip Idea HC*/

	bool			disable_cerr;

	bool			no_testmode_suspend; /* MSM Chipidea HC */

	u32			reset_delay;

	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */