Commit b01ff5cb authored Oct 07, 2014 by Roger Quadros Committed by Felipe Balbi Oct 23, 2014

Revert "usb: dwc3: dwc3-omap: Disable/Enable only wrapper interrupts in prepare/complete"



This reverts commit 02dae36a.

That commit is bogus in two ways:

1) There's no way dwc3-omap's ->suspend() can cause any effect
	on xhci's ->suspend(). Linux device driver model guarantees
	that a parent's ->suspend() will only be called after all
	children are suspended. dwc3-omap is the parent of the
	parent of xhci.

2) When implementing Deep Sleep states where context is lost,
	USBOTGSS_IRQ0 register, well, looses context so we
	_must_ rewrite it otherwise core IRQs will never be
	reenabled and USB will appear to be dead.

Fixes: 02dae36a (usb: dwc3: dwc3-omap: Disable/Enable only
	wrapper interrupts in prepare/complete)
Cc: <stable@vger.kernel.org> # v3.17
Cc: George Cherian <george.cherian@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent a6615937

drivers/usb/dwc3/dwc3-omap.c

+2 −13

Original line number	Diff line number	Diff line
		@@ -597,7 +597,7 @@ static int dwc3_omap_prepare(struct device *dev)
		{
		struct dwc3_omap *omap = dev_get_drvdata(dev);

		dwc3_omap_write_irqmisc_set(omap, 0x00);
		dwc3_omap_disable_irqs(omap);

		return 0;
		}
		@@ -605,19 +605,8 @@ static int dwc3_omap_prepare(struct device *dev)
		static void dwc3_omap_complete(struct device *dev)
		{
		struct dwc3_omap *omap = dev_get_drvdata(dev);
		u32 reg;

		reg = (USBOTGSS_IRQMISC_OEVT \|
		USBOTGSS_IRQMISC_DRVVBUS_RISE \|
		USBOTGSS_IRQMISC_CHRGVBUS_RISE \|
		USBOTGSS_IRQMISC_DISCHRGVBUS_RISE \|
		USBOTGSS_IRQMISC_IDPULLUP_RISE \|
		USBOTGSS_IRQMISC_DRVVBUS_FALL \|
		USBOTGSS_IRQMISC_CHRGVBUS_FALL \|
		USBOTGSS_IRQMISC_DISCHRGVBUS_FALL \|
		USBOTGSS_IRQMISC_IDPULLUP_FALL);

		dwc3_omap_write_irqmisc_set(omap, reg);
		dwc3_omap_enable_irqs(omap);
		}

		static int dwc3_omap_suspend(struct device *dev)