---

yaml --- r: 304011 b: refs/heads/master c: cda4db5 h: refs/heads/master i: 304009: eec5da6 304007: 9ed6a3b v: v3
git-mirror · May 21, 2012 · f1ed31d · f1ed31d
1 parent 942f173
commit f1ed31d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c88db160a30cccb81303212b256680f2e37e35ae
+refs/heads/master: cda4db53e9c28061c100400e1a4d273ea61dfba9
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -7035,6 +7035,14 @@ W:	http://pegasus2.sourceforge.net/
 S:	Maintained
 F:	drivers/net/usb/pegasus.*
 
+USB PHY LAYER
+M:	Felipe Balbi <balbi@ti.com>
+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 <zaitcev@redhat.com>
 L:	linux-usb@vger.kernel.org

diff --git 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) && !ehci->sched_size_bug) {
+	if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
 		/* 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
@@ -97,13 +97,6 @@ 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
@@ -149,7 +149,6 @@ 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)