Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 198ad2ce authored by Sascha Hauer's avatar Sascha Hauer
Browse files

USB ehci mxc: prepare/unprepare clock 



Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 97c3213f

drivers/usb/host/ehci-mxc.c

+9 −9
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
		ret = PTR_ERR(priv->usbclk);

		goto err_clk;

	}

	clk_enable(priv->usbclk);

	clk_prepare_enable(priv->usbclk);



	if (!cpu_is_mx35() && !cpu_is_mx25()) {

		priv->ahbclk = clk_get(dev, "usb_ahb");
@@ -179,7 +179,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
			ret = PTR_ERR(priv->ahbclk);

			goto err_clk_ahb;

		}

		clk_enable(priv->ahbclk);

		clk_prepare_enable(priv->ahbclk);

	}



	/* "dr" device has its own clock on i.MX51 */
@@ -189,7 +189,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
			ret = PTR_ERR(priv->phy1clk);

			goto err_clk_phy;

		}

		clk_enable(priv->phy1clk);

		clk_prepare_enable(priv->phy1clk);

	}
@@ -266,16 +266,16 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
		pdata->exit(pdev);

err_init:

	if (priv->phy1clk) {

		clk_disable(priv->phy1clk);

		clk_disable_unprepare(priv->phy1clk);

		clk_put(priv->phy1clk);

	}

err_clk_phy:

	if (priv->ahbclk) {

		clk_disable(priv->ahbclk);

		clk_disable_unprepare(priv->ahbclk);

		clk_put(priv->ahbclk);

	}

err_clk_ahb:

	clk_disable(priv->usbclk);

	clk_disable_unprepare(priv->usbclk);

	clk_put(priv->usbclk);

err_clk:

	iounmap(hcd->regs);
@@ -307,14 +307,14 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev) 
	usb_put_hcd(hcd);

	platform_set_drvdata(pdev, NULL);



	clk_disable(priv->usbclk);

	clk_disable_unprepare(priv->usbclk);

	clk_put(priv->usbclk);

	if (priv->ahbclk) {

		clk_disable(priv->ahbclk);

		clk_disable_unprepare(priv->ahbclk);

		clk_put(priv->ahbclk);

	}

	if (priv->phy1clk) {

		clk_disable(priv->phy1clk);

		clk_disable_unprepare(priv->phy1clk);

		clk_put(priv->phy1clk);

	}