mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-26 05:48:04 +00:00
Koen Kooi
aefc6c8c3c
The psp tree added a patch to limit the beaglebone to 500MHz when powered by USB, which triggered conflicts in the patches. The 3.2.16 series has been rediffed as well, no functional changes. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From f8f150a7dd5f865281c14bff1e2260ecc60e9f3f Mon Sep 17 00:00:00 2001
|
|
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
|
|
Date: Fri, 16 Mar 2012 13:27:39 -0700
|
|
Subject: [PATCH 36/68] xhci: Restore event ring dequeue pointer on resume.
|
|
|
|
commit fb3d85bc7193f23c9a564502df95564c49a32c91 upstream.
|
|
|
|
The xhci_save_registers() function saved the event ring dequeue pointer
|
|
in the s3 register structure, but xhci_restore_registers() never
|
|
restored it. No other code in the xHCI successful resume path would
|
|
ever restore it either. Fix that.
|
|
|
|
This should be backported to kernels as old as 2.6.37, that contain the
|
|
commit 5535b1d5f8885695c6ded783c692e3c0d0eda8ca "USB: xHCI: PCI power
|
|
management implementation".
|
|
|
|
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
|
|
Tested-by: Elric Fu <elricfu1@gmail.com>
|
|
Cc: Andiry Xu <andiry.xu@amd.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/usb/host/xhci.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
|
|
index 034f554..4d44713 100644
|
|
--- a/drivers/usb/host/xhci.c
|
|
+++ b/drivers/usb/host/xhci.c
|
|
@@ -681,6 +681,7 @@ static void xhci_restore_registers(struct xhci_hcd *xhci)
|
|
xhci_writel(xhci, xhci->s3.irq_control, &xhci->ir_set->irq_control);
|
|
xhci_writel(xhci, xhci->s3.erst_size, &xhci->ir_set->erst_size);
|
|
xhci_write_64(xhci, xhci->s3.erst_base, &xhci->ir_set->erst_base);
|
|
+ xhci_write_64(xhci, xhci->s3.erst_dequeue, &xhci->ir_set->erst_dequeue);
|
|
}
|
|
|
|
static void xhci_set_cmd_ring_deq(struct xhci_hcd *xhci)
|
|
--
|
|
1.7.10
|
|
|