aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/ehci-tegra.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 1f596fb7cf71..b02622a936c2 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -44,7 +44,6 @@ struct tegra_ehci_hcd {
44 struct ehci_hcd *ehci; 44 struct ehci_hcd *ehci;
45 struct tegra_usb_phy *phy; 45 struct tegra_usb_phy *phy;
46 struct clk *clk; 46 struct clk *clk;
47 struct clk *emc_clk;
48 struct usb_phy *transceiver; 47 struct usb_phy *transceiver;
49 int host_resumed; 48 int host_resumed;
50 int port_resuming; 49 int port_resuming;
@@ -56,7 +55,6 @@ static void tegra_ehci_power_up(struct usb_hcd *hcd)
56{ 55{
57 struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller); 56 struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
58 57
59 clk_prepare_enable(tegra->emc_clk);
60 clk_prepare_enable(tegra->clk); 58 clk_prepare_enable(tegra->clk);
61 usb_phy_set_suspend(&tegra->phy->u_phy, 0); 59 usb_phy_set_suspend(&tegra->phy->u_phy, 0);
62 tegra->host_resumed = 1; 60 tegra->host_resumed = 1;
@@ -69,7 +67,6 @@ static void tegra_ehci_power_down(struct usb_hcd *hcd)
69 tegra->host_resumed = 0; 67 tegra->host_resumed = 0;
70 usb_phy_set_suspend(&tegra->phy->u_phy, 1); 68 usb_phy_set_suspend(&tegra->phy->u_phy, 1);
71 clk_disable_unprepare(tegra->clk); 69 clk_disable_unprepare(tegra->clk);
72 clk_disable_unprepare(tegra->emc_clk);
73} 70}
74 71
75static int tegra_ehci_internal_port_reset( 72static int tegra_ehci_internal_port_reset(
@@ -694,16 +691,6 @@ static int tegra_ehci_probe(struct platform_device *pdev)
694 if (err) 691 if (err)
695 goto fail_clk; 692 goto fail_clk;
696 693
697 tegra->emc_clk = devm_clk_get(&pdev->dev, "emc");
698 if (IS_ERR(tegra->emc_clk)) {
699 dev_err(&pdev->dev, "Can't get emc clock\n");
700 err = PTR_ERR(tegra->emc_clk);
701 goto fail_emc_clk;
702 }
703
704 clk_prepare_enable(tegra->emc_clk);
705 clk_set_rate(tegra->emc_clk, 400000000);
706
707 tegra->needs_double_reset = of_property_read_bool(pdev->dev.of_node, 694 tegra->needs_double_reset = of_property_read_bool(pdev->dev.of_node,
708 "nvidia,needs-double-reset"); 695 "nvidia,needs-double-reset");
709 696
@@ -813,8 +800,6 @@ fail:
813#endif 800#endif
814 usb_phy_shutdown(&tegra->phy->u_phy); 801 usb_phy_shutdown(&tegra->phy->u_phy);
815fail_io: 802fail_io:
816 clk_disable_unprepare(tegra->emc_clk);
817fail_emc_clk:
818 clk_disable_unprepare(tegra->clk); 803 clk_disable_unprepare(tegra->clk);
819fail_clk: 804fail_clk:
820 usb_put_hcd(hcd); 805 usb_put_hcd(hcd);
@@ -842,8 +827,6 @@ static int tegra_ehci_remove(struct platform_device *pdev)
842 827
843 clk_disable_unprepare(tegra->clk); 828 clk_disable_unprepare(tegra->clk);
844 829
845 clk_disable_unprepare(tegra->emc_clk);
846
847 return 0; 830 return 0;
848} 831}
849 832