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

usb: host: tegra: don't touch EMC clock 

Clock "emc" is for the External Memory Controller. The USB driver has no
business touching this clock directly. Remove the code that does so.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Stephen Warren 2013-01-22 17:06:32 -07:00
parent bbdabdb62d
commit 9304512151
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,6 @@ struct tegra_ehci_hcd {
struct ehci_hcd *ehci; struct ehci_hcd *ehci;
struct tegra_usb_phy *phy; struct tegra_usb_phy *phy;
struct clk *clk; struct clk *clk;
struct clk *emc_clk;
struct usb_phy *transceiver; struct usb_phy *transceiver;
int host_resumed; int host_resumed;
int port_resuming; int port_resuming;
@ -56,7 +55,6 @@ 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_prepare_enable(tegra->emc_clk);
clk_prepare_enable(tegra->clk); clk_prepare_enable(tegra->clk);
usb_phy_set_suspend(&tegra->phy->u_phy, 0); usb_phy_set_suspend(&tegra->phy->u_phy, 0);
tegra->host_resumed = 1; tegra->host_resumed = 1;
@ -69,7 +67,6 @@ static void tegra_ehci_power_down(struct usb_hcd *hcd)
tegra->host_resumed = 0; tegra->host_resumed = 0;
usb_phy_set_suspend(&tegra->phy->u_phy, 1); usb_phy_set_suspend(&tegra->phy->u_phy, 1);
clk_disable_unprepare(tegra->clk); clk_disable_unprepare(tegra->clk);
clk_disable_unprepare(tegra->emc_clk);
} }
static int tegra_ehci_internal_port_reset( static int tegra_ehci_internal_port_reset(
@ -694,16 +691,6 @@ static int tegra_ehci_probe(struct platform_device *pdev)
if (err) if (err)
goto fail_clk; goto fail_clk;
tegra->emc_clk = devm_clk_get(&pdev->dev, "emc");
if (IS_ERR(tegra->emc_clk)) {
dev_err(&pdev->dev, "Can't get emc clock\n");
err = PTR_ERR(tegra->emc_clk);
goto fail_emc_clk;
}
clk_prepare_enable(tegra->emc_clk);
clk_set_rate(tegra->emc_clk, 400000000);
tegra->needs_double_reset = of_property_read_bool(pdev->dev.of_node, tegra->needs_double_reset = of_property_read_bool(pdev->dev.of_node,
"nvidia,needs-double-reset"); "nvidia,needs-double-reset");
@ -813,8 +800,6 @@ fail:
#endif #endif
usb_phy_shutdown(&tegra->phy->u_phy); usb_phy_shutdown(&tegra->phy->u_phy);
fail_io: fail_io:
clk_disable_unprepare(tegra->emc_clk);
fail_emc_clk:
clk_disable_unprepare(tegra->clk); clk_disable_unprepare(tegra->clk);
fail_clk: fail_clk:
usb_put_hcd(hcd); usb_put_hcd(hcd);
@ -842,8 +827,6 @@ static int tegra_ehci_remove(struct platform_device *pdev)
clk_disable_unprepare(tegra->clk); clk_disable_unprepare(tegra->clk);
clk_disable_unprepare(tegra->emc_clk);
return 0; return 0;
} }