From f1ed31db7f2dca07a6da4b097b53407d4b67b15f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 May 2012 09:59:23 -0700 Subject: [PATCH] --- yaml --- r: 304011 b: refs/heads/master c: cda4db53e9c28061c100400e1a4d273ea61dfba9 h: refs/heads/master i: 304009: eec5da666247b81e502525af4471d4a6ecf9f266 304007: 9ed6a3b285f650881e5653a16e072b365a0fb8e0 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 ++++++++ trunk/drivers/usb/host/ehci-hcd.c | 2 +- trunk/drivers/usb/host/ehci-pci.c | 7 ------- trunk/drivers/usb/host/ehci.h | 1 - 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e75ad4656fab..99fcaa1b1c14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c88db160a30cccb81303212b256680f2e37e35ae +refs/heads/master: cda4db53e9c28061c100400e1a4d273ea61dfba9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8741f75360a1..80d1d87f6db0 100644 --- 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 +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/usb/host/ehci-hcd.c b/trunk/drivers/usb/host/ehci-hcd.c index 5597e6099592..b100f5f9f4b6 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) && !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 index 4baafa3e80b2..bc94d7bf072d 100644 --- 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 index 2a6652fd5400..2694ed6558d2 100644 --- 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)