|
@@ -281,7 +281,7 @@ static int msm_otg_phy_clk_reset(struct msm_otg *motg)
|
|
|
{
|
|
|
int ret = 0;
|
|
|
|
|
|
- if (motg->pdata->phy_clk_reset && motg->phy_reset_clk)
|
|
|
+ if (motg->pdata->phy_clk_reset)
|
|
|
ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk);
|
|
|
else if (motg->phy_rst)
|
|
|
ret = reset_control_reset(motg->phy_rst);
|
|
@@ -1554,11 +1554,14 @@ static int msm_otg_probe(struct platform_device *pdev)
|
|
|
phy = &motg->phy;
|
|
|
phy->dev = &pdev->dev;
|
|
|
|
|
|
- motg->phy_reset_clk = devm_clk_get(&pdev->dev,
|
|
|
+ if (motg->pdata->phy_clk_reset) {
|
|
|
+ motg->phy_reset_clk = devm_clk_get(&pdev->dev,
|
|
|
np ? "phy" : "usb_phy_clk");
|
|
|
- if (IS_ERR(motg->phy_reset_clk)) {
|
|
|
- dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
|
|
|
- motg->phy_reset_clk = NULL;
|
|
|
+
|
|
|
+ if (IS_ERR(motg->phy_reset_clk)) {
|
|
|
+ dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
|
|
|
+ return PTR_ERR(motg->phy_reset_clk);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");
|