diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-14 15:48:34 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-14 15:48:34 +0000 |
commit | 9391118ede8d870b9e5a04f4130147d583e8f611 (patch) | |
tree | 2de8c7464d61932b23db5a18769b0b5901b9272f /target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch | |
parent | bd604be58220f286db3e22647cf63eb774686336 (diff) | |
download | master-187ad058-9391118ede8d870b9e5a04f4130147d583e8f611.tar.gz master-187ad058-9391118ede8d870b9e5a04f4130147d583e8f611.tar.bz2 master-187ad058-9391118ede8d870b9e5a04f4130147d583e8f611.zip |
linux/3.0: R.I.P.
It is used by the broken omap35xx/gumstix target only.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31717 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch')
-rw-r--r-- | target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch deleted file mode 100644 index a7eb07e4cb..0000000000 --- a/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -746,7 +746,7 @@ static int ehci_run (struct usb_hcd *hcd - "USB %x.%x started, EHCI %x.%02x%s\n", - ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), - temp >> 8, temp & 0xff, -- ignore_oc ? ", overcurrent ignored" : ""); -+ (ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : ""); - - ehci_writel(ehci, INTR_MASK, - &ehci->regs->intr_enable); /* Turn On Interrupts */ ---- a/drivers/usb/host/ehci-hub.c -+++ b/drivers/usb/host/ehci-hub.c -@@ -655,7 +655,7 @@ ehci_hub_status_data (struct usb_hcd *hc - * always set, seem to clear PORT_OCC and PORT_CSC when writing to - * PORT_POWER; that's surprising, but maybe within-spec. - */ -- if (!ignore_oc) -+ if (!ignore_oc && !ehci->ignore_oc) - mask = PORT_CSC | PORT_PEC | PORT_OCC; - else - mask = PORT_CSC | PORT_PEC; -@@ -880,7 +880,7 @@ static int ehci_hub_control ( - if (temp & PORT_PEC) - status |= USB_PORT_STAT_C_ENABLE << 16; - -- if ((temp & PORT_OCC) && !ignore_oc){ -+ if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){ - status |= USB_PORT_STAT_C_OVERCURRENT << 16; - - /* ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -138,6 +138,7 @@ struct ehci_hcd { /* one per controlle - 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 ignore_oc:1; - - /* required for usb32 quirk */ - #define OHCI_CTRL_HCFS (3 << 6) |