diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-01-24 20:01:33 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-24 20:01:33 +0000 |
commit | 6512aa455370c03c086a4c686cb10374365bb436 (patch) | |
tree | 9a5ec7a9dd891ad66f088ee261c5d83f6f0f5b01 /target/linux/mcs814x/patches-3.3/013-ohci_workarounds.patch | |
parent | f7ece95303309a320b1f577b41332aa15b6469b6 (diff) | |
download | upstream-6512aa455370c03c086a4c686cb10374365bb436.tar.gz upstream-6512aa455370c03c086a4c686cb10374365bb436.tar.bz2 upstream-6512aa455370c03c086a4c686cb10374365bb436.zip |
mcs814x: remove linux 3.3 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44106
Diffstat (limited to 'target/linux/mcs814x/patches-3.3/013-ohci_workarounds.patch')
-rw-r--r-- | target/linux/mcs814x/patches-3.3/013-ohci_workarounds.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/target/linux/mcs814x/patches-3.3/013-ohci_workarounds.patch b/target/linux/mcs814x/patches-3.3/013-ohci_workarounds.patch deleted file mode 100644 index 9b905a7529..0000000000 --- a/target/linux/mcs814x/patches-3.3/013-ohci_workarounds.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/drivers/usb/host/ohci.h -+++ b/drivers/usb/host/ohci.h -@@ -114,7 +114,7 @@ struct td { - /* PSW is only for ISO. Only 1 PSW entry is used, but on - * big-endian PPC hardware that's the second entry. - */ --#define MAXPSW 2 -+#define MAXPSW 8 - __hc16 hwPSW [MAXPSW]; - - /* rest are purely for the driver's use */ ---- a/drivers/usb/host/ohci-hcd.c -+++ b/drivers/usb/host/ohci-hcd.c -@@ -497,6 +497,7 @@ static int ohci_init (struct ohci_hcd *o - { - int ret; - struct usb_hcd *hcd = ohci_to_hcd(ohci); -+ u32 hcca_area; - - if (distrust_firmware) - ohci->flags |= OHCI_QUIRK_HUB_POWER; -@@ -550,11 +551,13 @@ static int ohci_init (struct ohci_hcd *o - if (ohci->hcca) - return 0; - -- ohci->hcca = dma_alloc_coherent (hcd->self.controller, -- sizeof *ohci->hcca, &ohci->hcca_dma, 0); -+ hcca_area = ohci_readl(ohci, &ohci->regs->hcca); -+ ohci->hcca = ioremap_nocache(hcca_area, sizeof *ohci->hcca); - if (!ohci->hcca) - return -ENOMEM; - -+ ohci->hcca_dma = hcca_area; -+ - if ((ret = ohci_mem_init (ohci)) < 0) - ohci_stop (hcd); - else { -@@ -572,6 +575,7 @@ static int ohci_init (struct ohci_hcd *o - */ - static int ohci_run (struct ohci_hcd *ohci) - { -+ int i = 0; - u32 mask, val; - int first = ohci->fminterval == 0; - struct usb_hcd *hcd = ohci_to_hcd(ohci); -@@ -622,6 +626,8 @@ static int ohci_run (struct ohci_hcd *oh - msleep(val); - - memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); -+ for (i = 0; i < NUM_INTS; i++) -+ ohci->hcca->int_table[i] = 0; - - /* 2msec timelimit here means no irqs/preempt */ - spin_lock_irq (&ohci->lock); -@@ -909,9 +915,6 @@ static void ohci_stop (struct usb_hcd *h - remove_debug_files (ohci); - ohci_mem_cleanup (ohci); - if (ohci->hcca) { -- dma_free_coherent (hcd->self.controller, -- sizeof *ohci->hcca, -- ohci->hcca, ohci->hcca_dma); - ohci->hcca = NULL; - ohci->hcca_dma = 0; - } |