diff options
| author | Martin Chi <mchi@nvidia.com> | 2014-04-25 00:26:24 +0800 |
|---|---|---|
| committer | Tony Ly <tly@nvidia.com> | 2014-06-05 11:59:04 -0700 |
| commit | 7b984f4acadbd156a8925120b580e92a6b55e1ac (patch) | |
| tree | f0b1c70666843e43c80a29b2e6c953c7dd8882c6 /drivers/usb | |
| parent | 2e643f189bdc428908ba43cce0d7569d670982f0 (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: I0f1165a1d9316a229c756e75cb905ba6fff88cda
Signed-off-by: Martin Chi <mchi@nvidia.com>
Reviewed-on: http://git-master/r/400933
(cherry picked from commit 19acbead48a7ff4e322ec249d9c37295ca347775)
Reviewed-on: http://git-master/r/419226
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/phy/tegra11x_usb_phy.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/phy/tegra11x_usb_phy.c b/drivers/usb/phy/tegra11x_usb_phy.c index 34d64d5326f9..3361e27151af 100644 --- a/drivers/usb/phy/tegra11x_usb_phy.c +++ b/drivers/usb/phy/tegra11x_usb_phy.c @@ -2089,6 +2089,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 |