Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357676
b: refs/heads/master
c: a8c4e9e
h: refs/heads/master
v: v3
  • Loading branch information
Roger Quadros committed Feb 13, 2013
1 parent f230148 commit f345c3d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c4df00aed9e2e6e3ab094b4bb8b9ecb64cf8c70e
refs/heads/master: a8c4e9e1118f0a12e3a9524d8d597487d7e3476d
18 changes: 9 additions & 9 deletions trunk/drivers/mfd/omap-usb-host.c
Original file line number Diff line number Diff line change
Expand Up @@ -671,32 +671,32 @@ static int usbhs_omap_probe(struct platform_device *pdev)
}

if (is_ehci_phy_mode(pdata->port_mode[0])) {
/* for OMAP3 , the clk set paretn fails */
/* for OMAP3, clk_set_parent fails */
ret = clk_set_parent(omap->utmi_p1_gfclk,
omap->xclk60mhsp1_ck);
if (ret != 0)
dev_err(dev, "xclk60mhsp1_ck set parent"
"failed error:%d\n", ret);
dev_dbg(dev, "xclk60mhsp1_ck set parent failed: %d\n",
ret);
} else if (is_ehci_tll_mode(pdata->port_mode[0])) {
ret = clk_set_parent(omap->utmi_p1_gfclk,
omap->init_60m_fclk);
if (ret != 0)
dev_err(dev, "init_60m_fclk set parent"
"failed error:%d\n", ret);
dev_dbg(dev, "P0 init_60m_fclk set parent failed: %d\n",
ret);
}

if (is_ehci_phy_mode(pdata->port_mode[1])) {
ret = clk_set_parent(omap->utmi_p2_gfclk,
omap->xclk60mhsp2_ck);
if (ret != 0)
dev_err(dev, "xclk60mhsp2_ck set parent"
"failed error:%d\n", ret);
dev_dbg(dev, "xclk60mhsp2_ck set parent failed: %d\n",
ret);
} else if (is_ehci_tll_mode(pdata->port_mode[1])) {
ret = clk_set_parent(omap->utmi_p2_gfclk,
omap->init_60m_fclk);
if (ret != 0)
dev_err(dev, "init_60m_fclk set parent"
"failed error:%d\n", ret);
dev_dbg(dev, "P1 init_60m_fclk set parent failed: %d\n",
ret);
}

omap_usbhs_init(dev);
Expand Down

0 comments on commit f345c3d

Please sign in to comment.