summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMartin Chi <mchi@nvidia.com>2014-03-12 12:37:37 +0800
committerMartin Chi <mchi@nvidia.com>2014-03-12 18:06:19 -0700
commit237b7daa258fbaae25af6a47099f0dab8af37a89 (patch)
tree5cb1a317fa7c3f85bda0aa6608d31c62c60cced0 /arch
parentaf6d768ff8df29a608886fcc22d5e697e753410d (diff)
usb:hsic: disable PMC master control in usb resume
disable pmc remote wake-up detection in usb resume to prevent the pmc remote wake-up during usb auto-resume, otherwise, the concurrent resume may cause hsic bus entering unexpected state and cause 'XactErr' errs. bug 1476774 Change-Id: I0d2babbb196208b454c3de31492a703dafeb6629 Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/380735 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Gray Lei <glei@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/tegra11x_usb_phy.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra11x_usb_phy.c b/arch/arm/mach-tegra/tegra11x_usb_phy.c
index 482306d1e259..acf740cc5a4f 100644
--- a/arch/arm/mach-tegra/tegra11x_usb_phy.c
+++ b/arch/arm/mach-tegra/tegra11x_usb_phy.c
@@ -1619,6 +1619,11 @@ static void uhsic_phy_restore_end(struct tegra_usb_phy *phy)
irq_disabled = true;
}
+ /* Disable PMC remote wake-up detection */
+ val = readl(base + UHSIC_PMC_WAKEUP0);
+ val &= ~EVENT_INT_ENB;
+ writel(val, base + UHSIC_PMC_WAKEUP0);
+
/*
* If pmc wakeup is detected after putting controller in suspend
* in usb_phy_bringup_host_cotroller, restart bringing up host