summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMartin Chi <mchi@nvidia.com>2014-01-11 10:42:41 +0800
committerMartin Chi <mchi@nvidia.com>2014-01-12 17:41:54 -0800
commit2afc8fda56f76e8809e09a7180729e8c18e8589c (patch)
tree902958a4253fe294f0a05110791f52f1971228b1 /drivers
parent7376643a34952cd0807855c35a27d15c8449477d (diff)
Arm: tegra: usb: set run bit after disabling PMC
Set run bit soon after disabling the PMC so that the delay in releasing the pmc_lock is avoided. Also add delay in phy_restore_end so that the resume will driven for minimum of 20ms. Bug 1264731 Bug 1382457 Bug 1438066 Change-Id: If4d53359d8a3f33898ed0663cbdf7d4c8310bcf9 Signed-off-by: Petlozu Pravareshwar <petlozup@nvidia.com> Reviewed-on: http://git-master/r/309449 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com> Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/354696 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/xhci-tegra.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index e7be70c016d9..816cca927913 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -1,7 +1,7 @@
/*
* xhci-tegra.c - Nvidia xHCI host controller driver
*
- * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -2527,7 +2527,7 @@ tegra_xhci_host_partition_elpg_exit(struct tegra_xhci_hcd *tegra)
}
pmc_init(tegra);
- pmc_data.pmc_ops->disable_pmc_bus_ctrl(&pmc_data);
+ pmc_data.pmc_ops->disable_pmc_bus_ctrl(&pmc_data, 0);
tegra->hc_in_elpg = false;
ret = xhci_resume(tegra->xhci, 0);
@@ -3620,7 +3620,7 @@ static void tegra_xhci_shutdown(struct platform_device *pdev)
return;
if (tegra->hc_in_elpg) {
- pmc_data.pmc_ops->disable_pmc_bus_ctrl(&pmc_data);
+ pmc_data.pmc_ops->disable_pmc_bus_ctrl(&pmc_data, 0);
} else {
xhci = tegra->xhci;
hcd = xhci_to_hcd(xhci);