From 9ed6a3b285f650881e5653a16e072b365a0fb8e0 Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Mon, 21 May 2012 05:34:24 -0700 Subject: [PATCH] --- yaml --- r: 304007 b: refs/heads/master c: c51fa66802b922070dfda0d77fac364c367db5f6 h: refs/heads/master i: 304005: f6f1009864fcefa014c097f25820fede2839df87 304003: 80ea3bfcb66b0598d5cb0c8fd89b3380c2d7fa45 303999: fb42631da2f1238bb981b5dabf68a2340dc265a9 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 -------- trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +- trunk/drivers/usb/host/ehci-hcd.c | 2 +- trunk/drivers/usb/host/ehci-pci.c | 7 +++++++ trunk/drivers/usb/host/ehci.h | 1 + 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 4e5a2f4f8e6a..714e53a5112e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e192910d96615a32646b8978b201b650f62ef34 +refs/heads/master: c51fa66802b922070dfda0d77fac364c367db5f6 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 80d1d87f6db0..8741f75360a1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7035,14 +7035,6 @@ W: http://pegasus2.sourceforge.net/ S: Maintained F: drivers/net/usb/pegasus.* -USB PHY LAYER -M: Felipe Balbi -L: linux-usb@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git -S: Maintained -F: drivers/usb/phy/ -F: drivers/usb/otg/ - USB PRINTER DRIVER (usblp) M: Pete Zaitcev L: linux-usb@vger.kernel.org diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 8852d23ef829..f2bc48b745ea 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -1604,7 +1604,7 @@ static struct usb_driver brcmf_usbdrvr = { .id_table = brcmf_usb_devid_table, .suspend = brcmf_usb_suspend, .resume = brcmf_usb_resume, - .supports_autosuspend = 1 + .supports_autosuspend = 1, .disable_hub_initiated_lpm = 1, }; diff --git a/trunk/drivers/usb/host/ehci-hcd.c b/trunk/drivers/usb/host/ehci-hcd.c index b100f5f9f4b6..5597e6099592 100644 --- a/trunk/drivers/usb/host/ehci-hcd.c +++ b/trunk/drivers/usb/host/ehci-hcd.c @@ -638,7 +638,7 @@ static int ehci_init(struct usb_hcd *hcd) INIT_LIST_HEAD(&ehci->cached_itd_list); INIT_LIST_HEAD(&ehci->cached_sitd_list); - if (HCC_PGM_FRAMELISTLEN(hcc_params)) { + if (HCC_PGM_FRAMELISTLEN(hcc_params) && !ehci->sched_size_bug) { /* periodic schedule size can be smaller than default */ switch (EHCI_TUNE_FLS) { case 0: ehci->periodic_size = 1024; break; diff --git a/trunk/drivers/usb/host/ehci-pci.c b/trunk/drivers/usb/host/ehci-pci.c index bc94d7bf072d..4baafa3e80b2 100644 --- a/trunk/drivers/usb/host/ehci-pci.c +++ b/trunk/drivers/usb/host/ehci-pci.c @@ -97,6 +97,13 @@ static int ehci_pci_setup(struct usb_hcd *hcd) break; } break; + + case PCI_VENDOR_ID_PHILIPS: + /* + * Philips controllers set HCC_PGM_FRAMELISTLEN, but + * they don't implement schedule sizes shorter than 1024. + */ + ehci->sched_size_bug = 1; } /* cache this readonly data; minimize chip reads */ diff --git a/trunk/drivers/usb/host/ehci.h b/trunk/drivers/usb/host/ehci.h index 2694ed6558d2..2a6652fd5400 100644 --- a/trunk/drivers/usb/host/ehci.h +++ b/trunk/drivers/usb/host/ehci.h @@ -149,6 +149,7 @@ struct ehci_hcd { /* one per controller */ unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ + unsigned sched_size_bug:1; /* Philips */ /* required for usb32 quirk */ #define OHCI_CTRL_HCFS (3 << 6)