Enable the optional HSIC clocks (60MHz and 480MHz) for the ports that are configured in HSIC mode.
Signed-off-by: Roger Quadros <rog...@ti.com> --- 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 6294f13..90dbd17 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -94,6 +94,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; @@ -291,7 +293,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) { @@ -300,6 +323,9 @@ static int usbhs_runtime_resume(struct device *dev) i, r); } } + break; + default: + break; } } @@ -320,9 +346,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; } } @@ -527,7 +565,10 @@ static int __devinit 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; @@ -571,7 +612,7 @@ static int __devinit 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), @@ -587,6 +628,24 @@ static int __devinit 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])) { @@ -630,8 +689,11 @@ static int __devinit 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); @@ -662,8 +724,11 @@ static int __devexit 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->xclk60mhsp2_ck); -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html