From: Benoit Goby <benoit@android.com>
Date: Thu, 22 Jul 2010 01:05:06 +0000 (-0700)
Subject: usb: gadget: Fix tegra udc in OTG mode
X-Git-Tag: firefly_0821_release~9833^2~309
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=288b58e155306231dfb5eccb3220e58bbc953b1e;p=firefly-linux-kernel-4.4.55.git

usb: gadget: Fix tegra udc in OTG mode

Check the transceiver state before checking udc->stopped
Enable/disable the PHY and the clock on cable events

Change-Id: Id5a8a1b94f83da8060786f31181014dd1d546fc7
Signed-off-by: Benoit Goby <benoit@android.com>
---

diff --git a/drivers/usb/gadget/fsl_tegra_udc.c b/drivers/usb/gadget/fsl_tegra_udc.c
index 5cf5e745d5af..bdd80df09d85 100644
--- a/drivers/usb/gadget/fsl_tegra_udc.c
+++ b/drivers/usb/gadget/fsl_tegra_udc.c
@@ -83,8 +83,12 @@ void fsl_udc_clk_release(void)
 
 void fsl_udc_clk_suspend(void)
 {
+	tegra_usb_phy_power_off(phy);
+	clk_disable(udc_clk);
 }
 
 void fsl_udc_clk_resume(void)
 {
+	clk_enable(udc_clk);
+	tegra_usb_phy_power_on(phy);
 }
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index df6142948331..7bbe2fb69d9d 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1779,15 +1779,7 @@ static irqreturn_t fsl_udc_irq(int irq, void *_udc)
 	u32 temp;
 #endif
 
-	/* Disable ISR for OTG host mode */
-	if (udc->stopped)
-		return IRQ_NONE;
 	spin_lock_irqsave(&udc->lock, flags);
-	irq_src = fsl_readl(&dr_regs->usbsts) & fsl_readl(&dr_regs->usbintr);
-	/* Clear notification bits */
-	fsl_writel(irq_src, &dr_regs->usbsts);
-
-	/* VDBG("irq_src [0x%8x]", irq_src); */
 
 #ifdef CONFIG_ARCH_TEGRA
 	if (udc->transceiver) {
@@ -1824,7 +1816,23 @@ static irqreturn_t fsl_udc_irq(int irq, void *_udc)
 			spin_unlock_irqrestore(&udc->lock, flags);
 			return IRQ_HANDLED;
 		}
-	} else {
+	}
+#endif
+
+	/* Disable ISR for OTG host mode */
+	if (udc->stopped) {
+		spin_unlock_irqrestore(&udc->lock, flags);
+		return IRQ_NONE;
+	}
+
+	irq_src = fsl_readl(&dr_regs->usbsts) & fsl_readl(&dr_regs->usbintr);
+	/* Clear notification bits */
+	fsl_writel(irq_src, &dr_regs->usbsts);
+
+	/* VDBG("irq_src [0x%8x]", irq_src); */
+
+#ifdef CONFIG_ARCH_TEGRA
+	if (!udc->transceiver) {
 		/* VBUS A session detection interrupts. When the interrupt is received,
 		 * the mark the vbus active shadow.
 		 */
@@ -2552,6 +2560,8 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_USB_OTG_UTILS
 	udc_controller->transceiver = otg_get_transceiver();
+	if (udc_controller->transceiver)
+		udc_controller->vbus_active = 1;
 #else
 #ifdef CONFIG_ARCH_TEGRA
 	/* Power down the phy if cable is not connected */