diff options
Diffstat (limited to 'drivers/usb/phy/phy-msm-usb.c')
-rw-r--r-- | drivers/usb/phy/phy-msm-usb.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c index 6ed67ea4ef7e..c9156beeadef 100644 --- a/drivers/usb/phy/phy-msm-usb.c +++ b/drivers/usb/phy/phy-msm-usb.c | |||
@@ -258,9 +258,7 @@ static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert) | |||
258 | { | 258 | { |
259 | int ret; | 259 | int ret; |
260 | 260 | ||
261 | if (motg->pdata->link_clk_reset) | 261 | if (assert) |
262 | ret = motg->pdata->link_clk_reset(motg->clk, assert); | ||
263 | else if (assert) | ||
264 | ret = reset_control_assert(motg->link_rst); | 262 | ret = reset_control_assert(motg->link_rst); |
265 | else | 263 | else |
266 | ret = reset_control_deassert(motg->link_rst); | 264 | ret = reset_control_deassert(motg->link_rst); |
@@ -276,9 +274,7 @@ static int msm_otg_phy_clk_reset(struct msm_otg *motg) | |||
276 | { | 274 | { |
277 | int ret = 0; | 275 | int ret = 0; |
278 | 276 | ||
279 | if (motg->pdata->phy_clk_reset) | 277 | if (motg->phy_rst) |
280 | ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk); | ||
281 | else if (motg->phy_rst) | ||
282 | ret = reset_control_reset(motg->phy_rst); | 278 | ret = reset_control_reset(motg->phy_rst); |
283 | 279 | ||
284 | if (ret) | 280 | if (ret) |
@@ -1546,16 +1542,6 @@ static int msm_otg_probe(struct platform_device *pdev) | |||
1546 | phy = &motg->phy; | 1542 | phy = &motg->phy; |
1547 | phy->dev = &pdev->dev; | 1543 | phy->dev = &pdev->dev; |
1548 | 1544 | ||
1549 | if (motg->pdata->phy_clk_reset) { | ||
1550 | motg->phy_reset_clk = devm_clk_get(&pdev->dev, | ||
1551 | np ? "phy" : "usb_phy_clk"); | ||
1552 | |||
1553 | if (IS_ERR(motg->phy_reset_clk)) { | ||
1554 | dev_err(&pdev->dev, "failed to get usb_phy_clk\n"); | ||
1555 | return PTR_ERR(motg->phy_reset_clk); | ||
1556 | } | ||
1557 | } | ||
1558 | |||
1559 | motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk"); | 1545 | motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk"); |
1560 | if (IS_ERR(motg->clk)) { | 1546 | if (IS_ERR(motg->clk)) { |
1561 | dev_err(&pdev->dev, "failed to get usb_hs_clk\n"); | 1547 | dev_err(&pdev->dev, "failed to get usb_hs_clk\n"); |