All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] OMAP: USB : Fix the EHCI enumeration and core retention issue
@ 2012-06-21 13:42 Keshava Munegowda
       [not found] ` <1340286132-20634-1-git-send-email-keshava_mgowda-l0cyMroinI0@public.gmane.org>
  2012-07-19 10:20 ` Felipe Balbi
  0 siblings, 2 replies; 39+ messages in thread
From: Keshava Munegowda @ 2012-06-21 13:42 UTC (permalink / raw)
  To: linux-omap-u79uwXL29TY76Z2rM5mHXA,
	linux-usb-u79uwXL29TY76Z2rM5mHXA, khilman-l0cyMroinI0
  Cc: Keshava Munegowda, balbi-l0cyMroinI0,
	sameo-VuQAYsv1563Yd54FQh9/CA, notasas-Re5JQEeQqe8AvxtiuMwx3w

This commit 354ab8567ae3107a8cbe7228c3181990ba598aac titled
"Fix OMAP EHCI suspend/resume failure (i693)" is causing
the usb hub and device detection fails in beagle XM
causeing NFS not functional. This affects the core retention too.
The same commit logic needs to be revisted adhering to hwmod and
device tree framework.
for now, this commit id 354ab8567ae3107a8cbe7228c3181990ba598aac
titled "Fix OMAP EHCI suspend/resume failure (i693)" reverted.

This patch is validated on BeagleXM with NFS support over
usb ethernet and USB mass storage and other device detection.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-omap.c |  164 +-----------------------------------------
 1 file changed, 1 insertion(+), 163 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 17cfb8a..272e661 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -56,15 +56,6 @@
 #define	EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT		8
 #define	EHCI_INSNREG05_ULPI_WRDATA_SHIFT		0
 
-/* Errata i693 */
-static struct clk	*utmi_p1_fck;
-static struct clk	*utmi_p2_fck;
-static struct clk	*xclk60mhsp1_ck;
-static struct clk	*xclk60mhsp2_ck;
-static struct clk	*usbhost_p1_fck;
-static struct clk	*usbhost_p2_fck;
-static struct clk	*init_60m_fclk;
-
 /*-------------------------------------------------------------------------*/
 
 static const struct hc_driver ehci_omap_hc_driver;
@@ -80,40 +71,6 @@ static inline u32 ehci_read(void __iomem *base, u32 reg)
 	return __raw_readl(base + reg);
 }
 
-/* Erratum i693 workaround sequence */
-static void omap_ehci_erratum_i693(struct ehci_hcd *ehci)
-{
-	int ret = 0;
-
-	/* Switch to the internal 60 MHz clock */
-	ret = clk_set_parent(utmi_p1_fck, init_60m_fclk);
-	if (ret != 0)
-		ehci_err(ehci, "init_60m_fclk set parent"
-			"failed error:%d\n", ret);
-
-	ret = clk_set_parent(utmi_p2_fck, init_60m_fclk);
-	if (ret != 0)
-		ehci_err(ehci, "init_60m_fclk set parent"
-			"failed error:%d\n", ret);
-
-	clk_enable(usbhost_p1_fck);
-	clk_enable(usbhost_p2_fck);
-
-	/* Wait 1ms and switch back to the external clock */
-	mdelay(1);
-	ret = clk_set_parent(utmi_p1_fck, xclk60mhsp1_ck);
-	if (ret != 0)
-		ehci_err(ehci, "xclk60mhsp1_ck set parent"
-			"failed error:%d\n", ret);
-
-	ret = clk_set_parent(utmi_p2_fck, xclk60mhsp2_ck);
-	if (ret != 0)
-		ehci_err(ehci, "xclk60mhsp2_ck set parent"
-			"failed error:%d\n", ret);
-
-	clk_disable(usbhost_p1_fck);
-	clk_disable(usbhost_p2_fck);
-}
 
 static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
 {
@@ -145,50 +102,6 @@ static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
 	}
 }
 
-static int omap_ehci_hub_control(
-	struct usb_hcd	*hcd,
-	u16		typeReq,
-	u16		wValue,
-	u16		wIndex,
-	char		*buf,
-	u16		wLength
-)
-{
-	struct ehci_hcd	*ehci = hcd_to_ehci(hcd);
-	u32 __iomem *status_reg = &ehci->regs->port_status[
-				(wIndex & 0xff) - 1];
-	u32		temp;
-	unsigned long	flags;
-	int		retval = 0;
-
-	spin_lock_irqsave(&ehci->lock, flags);
-
-	if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) {
-		temp = ehci_readl(ehci, status_reg);
-		if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) {
-			retval = -EPIPE;
-			goto done;
-		}
-
-		temp &= ~PORT_WKCONN_E;
-		temp |= PORT_WKDISC_E | PORT_WKOC_E;
-		ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
-
-		omap_ehci_erratum_i693(ehci);
-
-		set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports);
-		goto done;
-	}
-
-	spin_unlock_irqrestore(&ehci->lock, flags);
-
-	/* Handle the hub control events here */
-	return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
-done:
-	spin_unlock_irqrestore(&ehci->lock, flags);
-	return retval;
-}
-
 static void disable_put_regulator(
 		struct ehci_hcd_omap_platform_data *pdata)
 {
@@ -353,76 +266,9 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 	/* root ports should always stay powered */
 	ehci_port_power(omap_ehci, 1);
 
-	/* get clocks */
-	utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
-	if (IS_ERR(utmi_p1_fck)) {
-		ret = PTR_ERR(utmi_p1_fck);
-		dev_err(dev, "utmi_p1_gfclk failed error:%d\n",	ret);
-		goto err_add_hcd;
-	}
-
-	xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
-	if (IS_ERR(xclk60mhsp1_ck)) {
-		ret = PTR_ERR(xclk60mhsp1_ck);
-		dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
-		goto err_utmi_p1_fck;
-	}
-
-	utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");
-	if (IS_ERR(utmi_p2_fck)) {
-		ret = PTR_ERR(utmi_p2_fck);
-		dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
-		goto err_xclk60mhsp1_ck;
-	}
-
-	xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
-	if (IS_ERR(xclk60mhsp2_ck)) {
-		ret = PTR_ERR(xclk60mhsp2_ck);
-		dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
-		goto err_utmi_p2_fck;
-	}
-
-	usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");
-	if (IS_ERR(usbhost_p1_fck)) {
-		ret = PTR_ERR(usbhost_p1_fck);
-		dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);
-		goto err_xclk60mhsp2_ck;
-	}
-
-	usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
-	if (IS_ERR(usbhost_p2_fck)) {
-		ret = PTR_ERR(usbhost_p2_fck);
-		dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
-		goto err_usbhost_p1_fck;
-	}
-
-	init_60m_fclk = clk_get(dev, "init_60m_fclk");
-	if (IS_ERR(init_60m_fclk)) {
-		ret = PTR_ERR(init_60m_fclk);
-		dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
-		goto err_usbhost_p2_fck;
-	}
 
 	return 0;
 
-err_usbhost_p2_fck:
-	clk_put(usbhost_p2_fck);
-
-err_usbhost_p1_fck:
-	clk_put(usbhost_p1_fck);
-
-err_xclk60mhsp2_ck:
-	clk_put(xclk60mhsp2_ck);
-
-err_utmi_p2_fck:
-	clk_put(utmi_p2_fck);
-
-err_xclk60mhsp1_ck:
-	clk_put(xclk60mhsp1_ck);
-
-err_utmi_p1_fck:
-	clk_put(utmi_p1_fck);
-
 err_add_hcd:
 	disable_put_regulator(pdata);
 	pm_runtime_put_sync(dev);
@@ -452,14 +298,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
 	iounmap(hcd->regs);
 	usb_put_hcd(hcd);
 
-	clk_put(utmi_p1_fck);
-	clk_put(utmi_p2_fck);
-	clk_put(xclk60mhsp1_ck);
-	clk_put(xclk60mhsp2_ck);
-	clk_put(usbhost_p1_fck);
-	clk_put(usbhost_p2_fck);
-	clk_put(init_60m_fclk);

^ permalink raw reply related	[flat|nested] 39+ messages in thread

end of thread, other threads:[~2012-07-23 11:27 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-21 13:42 [PATCH] OMAP: USB : Fix the EHCI enumeration and core retention issue Keshava Munegowda
     [not found] ` <1340286132-20634-1-git-send-email-keshava_mgowda-l0cyMroinI0@public.gmane.org>
2012-06-21 13:43   ` Munegowda, Keshava
2012-06-21 19:02     ` Kevin Hilman
     [not found]       ` <87fw9o32v2.fsf-l0cyMroinI0@public.gmane.org>
2012-06-22  7:30         ` Munegowda, Keshava
     [not found]           ` <CAP05o4KxWFjCCP05KzQgo4vWLdvOCeT=DWGXvEEnyWkomH1tXA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-06-22 10:30             ` Felipe Balbi
     [not found]               ` <20120622103050.GG28472-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-06-22 14:14                 ` Kevin Hilman
2012-06-22 15:03                   ` Russ Dill
     [not found]                     ` <CA+Bv8XY-_x+Vh+D8sec5tvL9MkOYFKnts1WBp_AsCck2y6QNZg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-06-22 15:11                       ` Munegowda, Keshava
     [not found]                   ` <87ehp71liv.fsf-l0cyMroinI0@public.gmane.org>
2012-06-22 20:36                     ` Felipe Balbi
2012-06-25 18:35                       ` Kevin Hilman
     [not found]                         ` <87d34nfdei.fsf-l0cyMroinI0@public.gmane.org>
2012-07-02 16:54                           ` Kevin Hilman
     [not found]                             ` <871uku85o8.fsf-l0cyMroinI0@public.gmane.org>
2012-07-02 17:05                               ` Russ Dill
     [not found]                                 ` <CA+Bv8XaC64NChdcinrxagRYLZyTG7c05nDYy2EbfH-gfZUxnuw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-02 17:55                                   ` Kevin Hilman
2012-07-02 18:15                                     ` Samuel Ortiz
2012-07-03  0:14                               ` Kevin Hilman
2012-07-03  6:45                                 ` Munegowda, Keshava
2012-07-03  6:47                               ` Munegowda, Keshava
     [not found]                                 ` <CAP05o4+hxt6zY0AxK5aNW7a3Hyiw0_krP9=XK_prN5=Uk2SxmA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-03  7:22                                   ` Munegowda, Keshava
2012-07-04 13:33                                     ` Kevin Hilman
2012-07-05 11:19                                       ` Samuel Ortiz
2012-07-06 10:00                                         ` Munegowda, Keshava
     [not found]                                           ` <CAP05o4JEx0uSCH+mZzLhoV479A00uUumvYY_-b8dQ9j_5Awumw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-06 11:59                                             ` Munegowda, Keshava
2012-07-11 10:29                                               ` Samuel Ortiz
2012-07-11 12:53                                                 ` Munegowda, Keshava
2012-07-11 14:23                                                   ` Kevin Hilman
     [not found]                                                     ` <874npenzq0.fsf-l0cyMroinI0@public.gmane.org>
2012-07-12  6:41                                                       ` Munegowda, Keshava
     [not found]                                                         ` <CAP05o4+hQh-weQ_hfFMxY-byEijwDF3e-D9U5gwh6yRD7C_=Zw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-19 10:17                                                           ` Munegowda, Keshava
2012-06-22 14:11             ` Kevin Hilman
2012-06-22 14:35               ` Alan Stern
     [not found]               ` <87vcij1loh.fsf-l0cyMroinI0@public.gmane.org>
2012-06-22 14:43                 ` Munegowda, Keshava
2012-06-22 18:49                   ` Kevin Hilman
2012-07-23  8:33                   ` Roger Quadros
     [not found]                     ` <500D0C42.8030508-l0cyMroinI0@public.gmane.org>
2012-07-23 11:27                       ` Munegowda, Keshava
2012-07-19 10:20 ` Felipe Balbi
     [not found]   ` <20120719102013.GJ14302-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-07-19 12:02     ` Munegowda, Keshava
2012-07-19 22:54     ` Greg KH
     [not found]       ` <20120719225405.GB32547-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2012-07-19 22:55         ` Greg KH
     [not found]           ` <20120719225523.GC32547-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2012-07-20  8:06             ` Munegowda, Keshava
2012-07-19 15:15   ` Alan Stern

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.