commit fd60da1d8b30810bd711b17a3d19c438438c6d3d
author Anand Gadiyar <gadiyar@ti.com> Tue Jun 15 08:06:01 2010 -0500
committer Leed Aguilar <leed.aguilar@ti.com> Tue Jul 27 16:22:08 2010 -0500
tree d3927eafe3fa6def1b91ae595ba56db751c11202
parent 50eabd61a999313f5a33e2977d8e55a639436835

OMAP: OHCI: Add back HCD_FLAG_HW_ACCESSIBLE flag.

Disable the IRQ to protect against a irq when
clocks are not ready to service it.

Change-Id: Ie3b1ef7418d3a1eb9fc5a0124ba1ff04c627f9b8
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Acked-by: Axel Haslam <axelhaslam@ti.com>

drivers/usb/host/ohci-omap3.c

diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c
index 6010b22..d0800a3 100755
--- a/drivers/usb/host/ohci-omap3.c
+++ b/drivers/usb/host/ohci-omap3.c
@@ -686,7 +686,9 @@
 static int omap_ohci_bus_suspend(struct usb_hcd *hcd)
 {
 	struct ohci_omap_clock_defs *ohci_clocks;
+	struct ohci_hcd *ohci = hcd_to_ohci(hcd);
 	int ret = 0;
+	int ints;
 	u32 uhh_sysconfig, usbtll_sysconfig;
 
 	ohci_clocks = (struct ohci_omap_clock_defs *)
@@ -696,6 +698,27 @@
 		ret = ohci_bus_suspend(hcd);
 		if (ret)
 			return ret;
+
+		/* Disable interrupts */
+		ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
+		(void)ohci_readl(ohci, &ohci->regs->intrdisable);
+
+		/* Make sure any pending interrupts are cleared */
+		ints = ohci_readl(ohci, &ohci->regs->intrstatus);
+		ints &=  ohci_readl(ohci, &ohci->regs->intrenable);
+
+		if (ints) {
+			/*
+			 * Warn if there were any pending interrupts
+			 * and clear them
+			 */
+			ohci_writel(ohci, ints, &ohci->regs->intrstatus);
+			/* Read back to flush posted writes */
+			(void) ohci_readl(ohci, &ohci->regs->intrstatus);
+
+			printk(KERN_DEBUG "%s: cleared pending IRQs\n", __func__);
+		}
+
 		mdelay(8); /* MSTANDBY assertion delayed by ~8ms */
 
 		/* Need to set ForceStandby,ForceIdle here
@@ -719,7 +742,7 @@
 		clk_disable(ohci_clocks->usbtll_ick_clk);
 		clk_disable(ohci_clocks->usbtll_fck_clk);
 		ohci_clocks->suspended = 1;
-//		clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+		clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 	}
 
 	return ret;
@@ -728,6 +751,7 @@
 static int omap_ohci_bus_resume(struct usb_hcd *hcd)
 {
 	struct ohci_omap_clock_defs *ohci_clocks;
+	struct ohci_hcd *ohci = hcd_to_ohci(hcd);
 	int ret = 0;
 	u32 uhh_sysconfig, usbtll_sysconfig;
 
@@ -743,7 +767,6 @@
 		clk_enable(ohci_clocks->usbhost2_120m_fck_clk);
 		clk_enable(ohci_clocks->usbhost1_48m_fck_clk);
 		ohci_clocks->suspended = 0;
-//		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 
 		/* Need to set back to NoStandby,Noidle
 		 * FIXME: Maybe SmartIdle, SmartStandby will also work
@@ -759,6 +782,11 @@
 		uhh_sysconfig |= (1 << OMAP_UHH_SYSCONFIG_MIDLEMODE_SHIFT);
 		uhh_sysconfig |= (1 << OMAP_UHH_SYSCONFIG_SIDLEMODE_SHIFT);
 		omap_writel(uhh_sysconfig, OMAP_UHH_SYSCONFIG);
+		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+
+		/* Re-enable interrupts generation */
+		ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrenable);
+		(void)ohci_readl(ohci, &ohci->regs->intrdisable);
 
 		ret = ohci_bus_resume(hcd);
 	}