Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Prashant Gaikwad and committed by
Stephen Warren
20de12cc 1e674bc6

+10 -10
+10 -10
drivers/usb/host/ehci-tegra.c
··· 46 46 { 47 47 struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller); 48 48 49 - clk_enable(tegra->emc_clk); 50 - clk_enable(tegra->clk); 49 + clk_prepare_enable(tegra->emc_clk); 50 + clk_prepare_enable(tegra->clk); 51 51 tegra_usb_phy_power_on(tegra->phy); 52 52 tegra->host_resumed = 1; 53 53 } ··· 58 58 59 59 tegra->host_resumed = 0; 60 60 tegra_usb_phy_power_off(tegra->phy); 61 - clk_disable(tegra->clk); 62 - clk_disable(tegra->emc_clk); 61 + clk_disable_unprepare(tegra->clk); 62 + clk_disable_unprepare(tegra->emc_clk); 63 63 } 64 64 65 65 static int tegra_ehci_internal_port_reset( ··· 671 671 goto fail_clk; 672 672 } 673 673 674 - err = clk_enable(tegra->clk); 674 + err = clk_prepare_enable(tegra->clk); 675 675 if (err) 676 676 goto fail_clken; 677 677 ··· 682 682 goto fail_emc_clk; 683 683 } 684 684 685 - clk_enable(tegra->emc_clk); 685 + clk_prepare_enable(tegra->emc_clk); 686 686 clk_set_rate(tegra->emc_clk, 400000000); 687 687 688 688 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ··· 782 782 fail_phy: 783 783 iounmap(hcd->regs); 784 784 fail_io: 785 - clk_disable(tegra->emc_clk); 785 + clk_disable_unprepare(tegra->emc_clk); 786 786 clk_put(tegra->emc_clk); 787 787 fail_emc_clk: 788 - clk_disable(tegra->clk); 788 + clk_disable_unprepare(tegra->clk); 789 789 fail_clken: 790 790 clk_put(tegra->clk); 791 791 fail_clk: ··· 820 820 tegra_usb_phy_close(tegra->phy); 821 821 iounmap(hcd->regs); 822 822 823 - clk_disable(tegra->clk); 823 + clk_disable_unprepare(tegra->clk); 824 824 clk_put(tegra->clk); 825 825 826 - clk_disable(tegra->emc_clk); 826 + clk_disable_unprepare(tegra->emc_clk); 827 827 clk_put(tegra->emc_clk); 828 828 829 829 kfree(tegra);