hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: ehci-tegra: add clk_prepare/clk_unprepare 

Use clk_prepare/clk_unprepare as required by the generic clk framework.

Cc: stern@rowland.harvard.edu
Cc: gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Prashant Gaikwad 2012-06-05 09:59:38 +05:30 committed by Stephen Warren
parent 1e674bc668
commit 20de12ccf9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/usb/host/ehci-tegra.c
View File

@ -46,8 +46,8 @@ static void tegra_ehci_power_up(struct usb_hcd *hcd)
{ {
struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller); struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
clk_enable(tegra->emc_clk); clk_prepare_enable(tegra->emc_clk);
clk_enable(tegra->clk); clk_prepare_enable(tegra->clk);
tegra_usb_phy_power_on(tegra->phy); tegra_usb_phy_power_on(tegra->phy);
tegra->host_resumed = 1; tegra->host_resumed = 1;
} }
@ -58,8 +58,8 @@ static void tegra_ehci_power_down(struct usb_hcd *hcd)
tegra->host_resumed = 0; tegra->host_resumed = 0;
tegra_usb_phy_power_off(tegra->phy); tegra_usb_phy_power_off(tegra->phy);
clk_disable(tegra->clk); clk_disable_unprepare(tegra->clk);
clk_disable(tegra->emc_clk); clk_disable_unprepare(tegra->emc_clk);
} }
static int tegra_ehci_internal_port_reset( static int tegra_ehci_internal_port_reset(
@ -671,7 +671,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
goto fail_clk; goto fail_clk;
} }
err = clk_enable(tegra->clk); err = clk_prepare_enable(tegra->clk);
if (err) if (err)
goto fail_clken; goto fail_clken;
@ -682,7 +682,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
goto fail_emc_clk; goto fail_emc_clk;
} }
clk_enable(tegra->emc_clk); clk_prepare_enable(tegra->emc_clk);
clk_set_rate(tegra->emc_clk, 400000000); clk_set_rate(tegra->emc_clk, 400000000);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@ -782,10 +782,10 @@ fail:
fail_phy: fail_phy:
iounmap(hcd->regs); iounmap(hcd->regs);
fail_io: fail_io:
clk_disable(tegra->emc_clk); clk_disable_unprepare(tegra->emc_clk);
clk_put(tegra->emc_clk); clk_put(tegra->emc_clk);
fail_emc_clk: fail_emc_clk:
clk_disable(tegra->clk); clk_disable_unprepare(tegra->clk);
fail_clken: fail_clken:
clk_put(tegra->clk); clk_put(tegra->clk);
fail_clk: fail_clk:
@ -820,10 +820,10 @@ static int tegra_ehci_remove(struct platform_device *pdev)
tegra_usb_phy_close(tegra->phy); tegra_usb_phy_close(tegra->phy);
iounmap(hcd->regs); iounmap(hcd->regs);
clk_disable(tegra->clk); clk_disable_unprepare(tegra->clk);
clk_put(tegra->clk); clk_put(tegra->clk);
clk_disable(tegra->emc_clk); clk_disable_unprepare(tegra->emc_clk);
clk_put(tegra->emc_clk); clk_put(tegra->emc_clk);
kfree(tegra); kfree(tegra);