From patchwork Thu Jan 17 11:30:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 1996221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id ACF99DF2E1 for ; Thu, 17 Jan 2013 11:40:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tvnl1-00085h-RM; Thu, 17 Jan 2013 11:35:44 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tvngn-0005vL-69 for linux-arm-kernel@lists.infradead.org; Thu, 17 Jan 2013 11:31:26 +0000 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0HBVFUP010610; Thu, 17 Jan 2013 05:31:15 -0600 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0HBVFvF030234; Thu, 17 Jan 2013 05:31:15 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 17 Jan 2013 05:31:14 -0600 Received: from rockdesk.itg.ti.com (h16-65.vpn.ti.com [172.24.16.65]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0HBUWZQ016922; Thu, 17 Jan 2013 05:31:12 -0600 From: Roger Quadros To: , , Subject: [PATCH v7 15/22] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Date: Thu, 17 Jan 2013 13:30:24 +0200 Message-ID: <1358422231-24736-16-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1358422231-24736-1-git-send-email-rogerq@ti.com> References: <1358422231-24736-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130117_063122_320126_5848B014 X-CRM114-Status: GOOD ( 14.09 ) X-Spam-Score: -4.6 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux@arm.linux.org.uk, sshtylyov@mvista.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kishon@ti.com, linux-arm-kernel@lists.infradead.org, bjorn@mork.no, rogerq@ti.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Enable the optional HSIC clocks (60MHz and 480MHz) for the ports that are configured in HSIC mode. Signed-off-by: Roger Quadros --- drivers/mfd/omap-usb-host.c | 77 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 71 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index c75b79d..d9a242b 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -93,6 +93,8 @@ struct usbhs_hcd_omap { int nports; struct clk **utmi_clk; + struct clk **hsic60m_clk; + struct clk **hsic480m_clk; struct clk *xclk60mhsp1_ck; struct clk *xclk60mhsp2_ck; @@ -286,7 +288,28 @@ static int usbhs_runtime_resume(struct device *dev) clk_enable(omap->ehci_logic_fck); for (i = 0; i < omap->nports; i++) { - if (is_ehci_tll_mode(pdata->port_mode[i])) { + switch (pdata->port_mode[i]) { + case OMAP_EHCI_PORT_MODE_HSIC: + if (omap->hsic60m_clk[i]) { + r = clk_enable(omap->hsic60m_clk[i]); + if (r) { + dev_err(dev, + "Can't enable port %d hsic60m clk:%d\n", + i, r); + } + } + + if (omap->hsic480m_clk[i]) { + r = clk_enable(omap->hsic480m_clk[i]); + if (r) { + dev_err(dev, + "Can't enable port %d hsic480m clk:%d\n", + i, r); + } + } + /* Fall through as HSIC mode needs utmi_clk */ + + case OMAP_EHCI_PORT_MODE_TLL: if (omap->utmi_clk[i]) { r = clk_enable(omap->utmi_clk[i]); if (r) { @@ -295,6 +318,9 @@ static int usbhs_runtime_resume(struct device *dev) i, r); } } + break; + default: + break; } } @@ -315,9 +341,21 @@ static int usbhs_runtime_suspend(struct device *dev) spin_lock_irqsave(&omap->lock, flags); for (i = 0; i < omap->nports; i++) { - if (is_ehci_tll_mode(pdata->port_mode[i])) { + switch (pdata->port_mode[i]) { + case OMAP_EHCI_PORT_MODE_HSIC: + if (omap->hsic60m_clk[i]) + clk_disable(omap->hsic60m_clk[i]); + + if (omap->hsic480m_clk[i]) + clk_disable(omap->hsic480m_clk[i]); + /* Fall through as utmi_clks were used in HSIC mode */ + + case OMAP_EHCI_PORT_MODE_TLL: if (omap->utmi_clk[i]) clk_disable(omap->utmi_clk[i]); + break; + default: + break; } } @@ -524,7 +562,10 @@ static int usbhs_omap_probe(struct platform_device *pdev) i = sizeof(struct clk *) * omap->nports; omap->utmi_clk = devm_kzalloc(dev, i, GFP_KERNEL); - if (!omap->utmi_clk) { + omap->hsic480m_clk = devm_kzalloc(dev, i, GFP_KERNEL); + omap->hsic60m_clk = devm_kzalloc(dev, i, GFP_KERNEL); + + if (!omap->utmi_clk || !omap->hsic480m_clk || !omap->hsic60m_clk) { dev_err(dev, "Memory allocation failed\n"); ret = -ENOMEM; goto err_mem; @@ -582,7 +623,7 @@ static int usbhs_omap_probe(struct platform_device *pdev) for (i = 0; i < omap->nports; i++) { struct clk *pclk; - char clkname[] = "usb_host_hs_utmi_px_clk"; + char clkname[] = "usb_host_hs_hsic480m_px_clk"; /* clock names are indexed from 1*/ snprintf(clkname, sizeof(clkname), @@ -598,6 +639,24 @@ static int usbhs_omap_probe(struct platform_device *pdev) clkname, PTR_ERR(pclk)); else omap->utmi_clk[i] = pclk; + + snprintf(clkname, sizeof(clkname), + "usb_host_hs_hsic480m_p%d_clk", i + 1); + pclk = clk_get(dev, clkname); + if (IS_ERR(pclk)) + dev_dbg(dev, "Failed to get clock : %s : %ld\n", + clkname, PTR_ERR(pclk)); + else + omap->hsic480m_clk[i] = pclk; + + snprintf(clkname, sizeof(clkname), + "usb_host_hs_hsic60m_p%d_clk", i + 1); + pclk = clk_get(dev, clkname); + if (IS_ERR(pclk)) + dev_dbg(dev, "Failed to get clock : %s : %ld\n", + clkname, PTR_ERR(pclk)); + else + omap->hsic60m_clk[i] = pclk; } if (is_ehci_phy_mode(pdata->port_mode[0])) { @@ -641,8 +700,11 @@ static int usbhs_omap_probe(struct platform_device *pdev) err_alloc: omap_usbhs_deinit(&pdev->dev); - for (i = 0; i < omap->nports; i++) + for (i = 0; i < omap->nports; i++) { clk_put(omap->utmi_clk[i]); + clk_put(omap->hsic60m_clk[i]); + clk_put(omap->hsic480m_clk[i]); + } clk_put(omap->init_60m_fclk); @@ -680,8 +742,11 @@ static int usbhs_omap_remove(struct platform_device *pdev) omap_usbhs_deinit(&pdev->dev); - for (i = 0; i < omap->nports; i++) + for (i = 0; i < omap->nports; i++) { clk_put(omap->utmi_clk[i]); + clk_put(omap->hsic60m_clk[i]); + clk_put(omap->hsic480m_clk[i]); + } clk_put(omap->init_60m_fclk); clk_put(omap->utmi_p1_gfclk);