summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMartin Chi <mchi@nvidia.com>2014-02-26 09:34:43 +0800
committerMartin Chi <mchi@nvidia.com>2014-02-25 21:14:12 -0800
commitb56bba4516ee688c30e0f25075a0da73b01ff87a (patch)
tree31a8a877a9e85e6e849cea5dcfaa49169efa80c8 /arch
parent34146c5698ba0cf378b0c71054b26214807cc525 (diff)
usb: hsic: add delay during hsic phy resume
bug 1451863 bug 1438066 Change-Id: Ide69944890380869ebeb37aa423b83b50724c443 Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/366448 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/tegra11x_usb_phy.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra11x_usb_phy.c b/arch/arm/mach-tegra/tegra11x_usb_phy.c
index bce29d06031a..4ce52ca0c6f8 100644
--- a/arch/arm/mach-tegra/tegra11x_usb_phy.c
+++ b/arch/arm/mach-tegra/tegra11x_usb_phy.c
@@ -1623,6 +1623,13 @@ static void uhsic_phy_restore_end(struct tegra_usb_phy *phy)
phy->ctrlr_suspended = false;
}
+ if (irq_disabled) {
+ local_irq_restore(flags);
+ mdelay(25);
+ local_irq_save(flags);
+ } else
+ mdelay(25);
+
pmc->pmc_ops->disable_pmc_bus_ctrl(pmc, 1);
phy->pmc_remote_wakeup = false;