mirror of https://github.com/hak5/openwrt.git
bcm27xx: drop outdated kernel version switches from patches-5.4
This drops some ancient kernel version switches from patches on bcm27xx target. The patch only adjusts the latest kernel 5.4, as doing it a second time for an older kernel seems a waste of time for a cosmetic change. Refresh remaining target patches. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>master
parent
8ff813e5f4
commit
41b5ca1458
|
@ -7658,7 +7658,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+}
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c
|
||||
@@ -0,0 +1,1409 @@
|
||||
@@ -0,0 +1,1405 @@
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/module.h>
|
||||
|
@ -7703,11 +7703,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+
|
||||
+#include <linux/version.h>
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
|
||||
+# include <linux/usb/gadget.h>
|
||||
+#else
|
||||
+# include <linux/usb_gadget.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <asm/io.h>
|
||||
+#include <asm/page.h>
|
||||
|
@ -15687,7 +15683,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+SEARCHENGINE = NO
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/dwc_otg/dummy_audio.c
|
||||
@@ -0,0 +1,1574 @@
|
||||
@@ -0,0 +1,1570 @@
|
||||
+/*
|
||||
+ * zero.c -- Gadget Zero, for USB development
|
||||
+ *
|
||||
|
@ -15774,11 +15770,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#include <asm/system.h>
|
||||
+#include <asm/unaligned.h>
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
|
||||
+# include <linux/usb/ch9.h>
|
||||
+#else
|
||||
+# include <linux/usb_ch9.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <linux/usb_gadget.h>
|
||||
+
|
||||
|
@ -32906,7 +32898,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#endif
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
|
||||
@@ -0,0 +1,1772 @@
|
||||
@@ -0,0 +1,1768 @@
|
||||
+/* ==========================================================================
|
||||
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
|
||||
+ * $Revision: #92 $
|
||||
|
@ -33842,11 +33834,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#if defined(LM_INTERFACE) || defined(PLATFORM_INTERFACE)
|
||||
+ dev_dbg(&_dev->dev, "Calling set_irq_type\n");
|
||||
+ set_irq_type(devirq,
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
|
||||
+ IRQT_LOW
|
||||
+#else
|
||||
+ IRQ_TYPE_LEVEL_LOW
|
||||
+#endif
|
||||
+ );
|
||||
+#endif
|
||||
+#endif /*IRQF_TRIGGER_LOW*/
|
||||
|
@ -36683,7 +36671,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+END(_dwc_otg_fiq_stub)
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
|
||||
@@ -0,0 +1,4327 @@
|
||||
@@ -0,0 +1,4325 @@
|
||||
+
|
||||
+/* ==========================================================================
|
||||
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.c $
|
||||
|
@ -37368,7 +37356,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
|
||||
+int dwc_otg_hcd_endpoint_reset(dwc_otg_hcd_t * hcd, void *ep_handle)
|
||||
+{
|
||||
+ int retval = 0;
|
||||
|
@ -37379,7 +37366,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ qh->data_toggle = DWC_OTG_HC_PID_DATA0;
|
||||
+ return retval;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+/**
|
||||
+ * HCD Callback structure for handling mode switching.
|
||||
|
@ -46207,7 +46193,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#endif /* DWC_DEVICE_ONLY */
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
||||
@@ -0,0 +1,1083 @@
|
||||
@@ -0,0 +1,1034 @@
|
||||
+
|
||||
+/* ==========================================================================
|
||||
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_linux.c $
|
||||
|
@ -46265,18 +46251,10 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#include <asm/fiq.h>
|
||||
+#endif
|
||||
+#include <linux/usb.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
|
||||
+#include <../drivers/usb/core/hcd.h>
|
||||
+#else
|
||||
+#include <linux/usb/hcd.h>
|
||||
+#endif
|
||||
+#include <asm/bug.h>
|
||||
+
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30))
|
||||
+#define USB_URB_EP_LINKING 1
|
||||
+#else
|
||||
+#define USB_URB_EP_LINKING 0
|
||||
+#endif
|
||||
+
|
||||
+#include "dwc_otg_hcd_if.h"
|
||||
+#include "dwc_otg_dbg.h"
|
||||
|
@ -46307,24 +46285,13 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+/** @{ */
|
||||
+/* manage i/o requests, device state */
|
||||
+static int dwc_otg_urb_enqueue(struct usb_hcd *hcd,
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+ struct usb_host_endpoint *ep,
|
||||
+#endif
|
||||
+ struct urb *urb, gfp_t mem_flags);
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd, struct urb *urb);
|
||||
+#endif
|
||||
+#else /* kernels at or post 2.6.30 */
|
||||
+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd,
|
||||
+ struct urb *urb, int status);
|
||||
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */
|
||||
+
|
||||
+static void endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoint *ep);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
|
||||
+static void endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep);
|
||||
+#endif
|
||||
+static irqreturn_t dwc_otg_hcd_irq(struct usb_hcd *hcd);
|
||||
+extern int hcd_start(struct usb_hcd *hcd);
|
||||
+extern void hcd_stop(struct usb_hcd *hcd);
|
||||
|
@ -46359,9 +46326,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ .urb_enqueue = dwc_otg_urb_enqueue,
|
||||
+ .urb_dequeue = dwc_otg_urb_dequeue,
|
||||
+ .endpoint_disable = endpoint_disable,
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
|
||||
+ .endpoint_reset = endpoint_reset,
|
||||
+#endif
|
||||
+ .get_frame_number = get_frame_number,
|
||||
+
|
||||
+ .hub_status_data = hub_status_data,
|
||||
|
@ -46583,11 +46548,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#if USB_URB_EP_LINKING
|
||||
+ usb_hcd_unlink_urb_from_ep(dwc_otg_hcd_to_hcd(hcd), urb);
|
||||
+#endif
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+ usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb);
|
||||
+#else
|
||||
+ usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb, urb->status);
|
||||
+#endif
|
||||
+ } else {
|
||||
+ new_entry->urb = urb;
|
||||
+#if USB_URB_EP_LINKING
|
||||
|
@ -46787,14 +46748,10 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ * Allocate memory for the base HCD plus the DWC OTG HCD.
|
||||
+ * Initialize the base HCD.
|
||||
+ */
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
+ hcd = usb_create_hcd(&dwc_otg_hc_driver, &_dev->dev, _dev->dev.bus_id);
|
||||
+#else
|
||||
+ hcd = usb_create_hcd(&dwc_otg_hc_driver, &_dev->dev, dev_name(&_dev->dev));
|
||||
+ hcd->has_tt = 1;
|
||||
+// hcd->uses_new_polling = 1;
|
||||
+// hcd->poll_rh = 0;
|
||||
+#endif
|
||||
+ if (!hcd) {
|
||||
+ retval = -ENOMEM;
|
||||
+ goto error1;
|
||||
|
@ -46839,13 +46796,8 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#endif
|
||||
+
|
||||
+ hcd->self.otg_port = dwc_otg_hcd_otg_port(dwc_otg_hcd);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) //don't support for LM(with 2.6.20.1 kernel)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) //version field absent later
|
||||
+ hcd->self.otg_version = dwc_otg_get_otg_version(otg_dev->core_if);
|
||||
+#endif
|
||||
+ /* Don't support SG list at this point */
|
||||
+ hcd->self.sg_tablesize = 0;
|
||||
+#endif
|
||||
+ /*
|
||||
+ * Finish generic HCD initialization and start the HCD. This function
|
||||
+ * allocates the DMA buffer pool, registers the USB bus, requests the
|
||||
|
@ -47007,15 +46959,10 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ * (URB). mem_flags indicates the type of memory allocation to use while
|
||||
+ * processing this URB. */
|
||||
+static int dwc_otg_urb_enqueue(struct usb_hcd *hcd,
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+ struct usb_host_endpoint *ep,
|
||||
+#endif
|
||||
+ struct urb *urb, gfp_t mem_flags)
|
||||
+{
|
||||
+ int retval = 0;
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
|
||||
+ struct usb_host_endpoint *ep = urb->ep;
|
||||
+#endif
|
||||
+ dwc_irqflags_t irqflags;
|
||||
+ void **ref_ep_hcpriv = &ep->hcpriv;
|
||||
+ dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
|
||||
|
@ -47151,11 +47098,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+
|
||||
+/** Aborts/cancels a USB transfer request. Always returns 0 to indicate
|
||||
+ * success. */
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
|
||||
+#else
|
||||
+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
|
||||
+#endif
|
||||
+{
|
||||
+ dwc_irqflags_t flags;
|
||||
+ dwc_otg_hcd_t *dwc_otg_hcd;
|
||||
|
@ -47191,11 +47134,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags);
|
||||
+
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+ usb_hcd_giveback_urb(hcd, urb);
|
||||
+#else
|
||||
+ usb_hcd_giveback_urb(hcd, urb, status);
|
||||
+#endif
|
||||
+ if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
|
||||
+ DWC_PRINTF("Called usb_hcd_giveback_urb() \n");
|
||||
+ DWC_PRINTF(" 1urb->status = %d\n", urb->status);
|
||||
|
@ -47225,7 +47164,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ ep->hcpriv = NULL;
|
||||
+}
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
|
||||
+/* Resets endpoint specific parameter values, in current version used to reset
|
||||
+ * the data toggle(as a WA). This function can be called from usb_clear_halt routine */
|
||||
+static void endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
|
||||
|
@ -47241,7 +47179,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ }
|
||||
+ DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+/** Handles host mode interrupts for the DWC_otg controller. Returns IRQ_NONE if
|
||||
+ * there was no interrupt to handle. Returns IRQ_HANDLED if there was a valid
|
||||
|
@ -48266,7 +48203,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#endif /* DWC_DEVICE_ONLY */
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
|
||||
@@ -0,0 +1,199 @@
|
||||
@@ -0,0 +1,170 @@
|
||||
+#ifndef _DWC_OS_DEP_H_
|
||||
+#define _DWC_OS_DEP_H_
|
||||
+
|
||||
|
@ -48299,25 +48236,11 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+
|
||||
+#include <linux/version.h>
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
|
||||
+# include <linux/irq.h>
|
||||
+#endif
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
|
||||
+# include <linux/usb/ch9.h>
|
||||
+#else
|
||||
+# include <linux/usb_ch9.h>
|
||||
+#endif
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
|
||||
+# include <linux/usb/gadget.h>
|
||||
+#else
|
||||
+# include <linux/usb_gadget.h>
|
||||
+#endif
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
|
||||
+# include <asm/irq.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifdef PCI_INTERFACE
|
||||
+# include <asm/io.h>
|
||||
|
@ -48328,19 +48251,12 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+# include <asm/sizes.h>
|
||||
+# include <asm/param.h>
|
||||
+# include <asm/io.h>
|
||||
+# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
|
||||
+# include <asm/arch/hardware.h>
|
||||
+# include <asm/arch/lm.h>
|
||||
+# include <asm/arch/irqs.h>
|
||||
+# include <asm/arch/regs-irq.h>
|
||||
+# else
|
||||
+/* in 2.6.31, at least, we seem to have lost the generic LM infrastructure -
|
||||
+ here we assume that the machine architecture provides definitions
|
||||
+ in its own header
|
||||
+*/
|
||||
+# include <mach/lm.h>
|
||||
+# include <mach/hardware.h>
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
+#ifdef PLATFORM_INTERFACE
|
||||
|
@ -48353,14 +48269,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+/** The OS page size */
|
||||
+#define DWC_OS_PAGE_SIZE PAGE_SIZE
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
|
||||
+typedef int gfp_t;
|
||||
+#endif
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
||||
+# define IRQF_SHARED SA_SHIRQ
|
||||
+#endif
|
||||
+
|
||||
+typedef struct os_dependent {
|
||||
+ /** Base address returned from ioremap() */
|
||||
+ void *base;
|
||||
|
@ -56987,7 +56895,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+#endif /* DWC_HOST_ONLY */
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
|
||||
@@ -0,0 +1,1262 @@
|
||||
@@ -0,0 +1,1176 @@
|
||||
+ /* ==========================================================================
|
||||
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $
|
||||
+ * $Revision: #21 $
|
||||
|
@ -57231,67 +57139,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ kfree(req);
|
||||
+}
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+/**
|
||||
+ * This function allocates an I/O buffer to be used for a transfer
|
||||
+ * to/from the specified endpoint.
|
||||
+ *
|
||||
+ * @param usb_ep The endpoint to be used with with the request
|
||||
+ * @param bytes The desired number of bytes for the buffer
|
||||
+ * @param dma Pointer to the buffer's DMA address; must be valid
|
||||
+ * @param gfp_flags the GFP_* flags to use.
|
||||
+ * @return address of a new buffer or null is buffer could not be allocated.
|
||||
+ */
|
||||
+static void *dwc_otg_pcd_alloc_buffer(struct usb_ep *usb_ep, unsigned bytes,
|
||||
+ dma_addr_t * dma, gfp_t gfp_flags)
|
||||
+{
|
||||
+ void *buf;
|
||||
+ dwc_otg_pcd_t *pcd = 0;
|
||||
+
|
||||
+ pcd = gadget_wrapper->pcd;
|
||||
+
|
||||
+ DWC_DEBUGPL(DBG_PCDV, "%s(%p,%d,%p,%0x)\n", __func__, usb_ep, bytes,
|
||||
+ dma, gfp_flags);
|
||||
+
|
||||
+ /* Check dword alignment */
|
||||
+ if ((bytes & 0x3UL) != 0) {
|
||||
+ DWC_WARN("%s() Buffer size is not a multiple of"
|
||||
+ "DWORD size (%d)", __func__, bytes);
|
||||
+ }
|
||||
+
|
||||
+ buf = dma_alloc_coherent(NULL, bytes, dma, gfp_flags);
|
||||
+ WARN_ON(!buf);
|
||||
+
|
||||
+ /* Check dword alignment */
|
||||
+ if (((int)buf & 0x3UL) != 0) {
|
||||
+ DWC_WARN("%s() Buffer is not DWORD aligned (%p)",
|
||||
+ __func__, buf);
|
||||
+ }
|
||||
+
|
||||
+ return buf;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * This function frees an I/O buffer that was allocated by alloc_buffer.
|
||||
+ *
|
||||
+ * @param usb_ep the endpoint associated with the buffer
|
||||
+ * @param buf address of the buffer
|
||||
+ * @param dma The buffer's DMA address
|
||||
+ * @param bytes The number of bytes of the buffer
|
||||
+ */
|
||||
+static void dwc_otg_pcd_free_buffer(struct usb_ep *usb_ep, void *buf,
|
||||
+ dma_addr_t dma, unsigned bytes)
|
||||
+{
|
||||
+ dwc_otg_pcd_t *pcd = 0;
|
||||
+
|
||||
+ pcd = gadget_wrapper->pcd;
|
||||
+
|
||||
+ DWC_DEBUGPL(DBG_PCDV, "%s(%p,%0x,%d)\n", __func__, buf, dma, bytes);
|
||||
+
|
||||
+ dma_free_coherent(NULL, bytes, buf, dma);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+/**
|
||||
+ * This function is used to submit an I/O Request to an EP.
|
||||
+ *
|
||||
|
@ -57347,9 +57194,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ is_isoc_ep = 0;
|
||||
+ else
|
||||
+ is_isoc_ep = (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) ? 1 : 0;
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+ dma_addr = usb_req->dma;
|
||||
+#else
|
||||
+ if (GET_CORE_IF(pcd)->dma_enable) {
|
||||
+ dwc_otg_device_t *otg_dev = gadget_wrapper->pcd->otg_dev;
|
||||
+ struct device *dev = NULL;
|
||||
|
@ -57366,7 +57210,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ DMA_FROM_DEVICE);
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+#ifdef DWC_UTE_PER_IO
|
||||
+ if (is_isoc_ep == 1) {
|
||||
|
@ -57449,8 +57292,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+//#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30))
|
||||
+#if 0
|
||||
+/**
|
||||
+ * ep_wedge: sets the halt feature and ignores clear requests
|
||||
+ *
|
||||
|
@ -57483,7 +57324,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+
|
||||
+ return retval;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#ifdef DWC_EN_ISOC
|
||||
+/**
|
||||
|
@ -57589,11 +57429,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ .alloc_request = dwc_otg_pcd_alloc_request,
|
||||
+ .free_request = dwc_otg_pcd_free_request,
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+ .alloc_buffer = dwc_otg_pcd_alloc_buffer,
|
||||
+ .free_buffer = dwc_otg_pcd_free_buffer,
|
||||
+#endif
|
||||
+
|
||||
+ .queue = ep_queue,
|
||||
+ .dequeue = ep_dequeue,
|
||||
+
|
||||
|
@ -57633,13 +57468,8 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ .alloc_request = dwc_otg_pcd_alloc_request,
|
||||
+ .free_request = dwc_otg_pcd_free_request,
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
|
||||
+ .alloc_buffer = dwc_otg_pcd_alloc_buffer,
|
||||
+ .free_buffer = dwc_otg_pcd_free_buffer,
|
||||
+#else
|
||||
+ /* .set_wedge = ep_wedge, */
|
||||
+ .set_wedge = NULL, /* uses set_halt instead */
|
||||
+#endif
|
||||
+
|
||||
+ .queue = ep_queue,
|
||||
+ .dequeue = ep_dequeue,
|
||||
|
@ -57853,9 +57683,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ void *req_handle, int32_t status, uint32_t actual)
|
||||
+{
|
||||
+ struct usb_request *req = (struct usb_request *)req_handle;
|
||||
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)
|
||||
+ struct dwc_otg_pcd_ep *ep = NULL;
|
||||
+#endif
|
||||
+
|
||||
+ if (req && req->complete) {
|
||||
+ switch (status) {
|
||||
|
@ -57881,7 +57709,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ req->complete(ep_handle, req);
|
||||
+ DWC_SPINLOCK(pcd->lock);
|
||||
+ }
|
||||
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)
|
||||
+ ep = ep_from_handle(pcd, ep_handle);
|
||||
+ if (GET_CORE_IF(pcd)->dma_enable) {
|
||||
+ if (req->length != 0) {
|
||||
|
@ -57896,7 +57723,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ DMA_TO_DEVICE: DMA_FROM_DEVICE);
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
|
@ -58147,11 +57973,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
+ d->gadget.name = pcd_name;
|
||||
+ d->pcd = otg_dev->pcd;
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
|
||||
+ strcpy(d->gadget.dev.bus_id, "gadget");
|
||||
+#else
|
||||
+ dev_set_name(&d->gadget.dev, "%s", "gadget");
|
||||
+#endif
|
||||
+
|
||||
+ d->gadget.dev.parent = &_dev->dev;
|
||||
+ d->gadget.dev.release = dwc_otg_pcd_gadget_release;
|
||||
|
|
|
@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||
|
||||
--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
||||
@@ -138,7 +138,7 @@ static struct hc_driver dwc_otg_hc_drive
|
||||
@@ -119,7 +119,7 @@ static struct hc_driver dwc_otg_hc_drive
|
||||
|
||||
.irq = dwc_otg_hcd_irq,
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
|
|||
|
||||
--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
||||
@@ -821,10 +821,6 @@ static int dwc_otg_urb_enqueue(struct us
|
||||
@@ -782,10 +782,6 @@ static int dwc_otg_urb_enqueue(struct us
|
||||
dump_urb_info(urb, "dwc_otg_urb_enqueue");
|
||||
}
|
||||
#endif
|
||||
|
@ -43,7 +43,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
|
|||
if ((usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS)
|
||||
|| (usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) {
|
||||
if (!dwc_otg_hcd_is_bandwidth_allocated
|
||||
@@ -881,6 +877,13 @@ static int dwc_otg_urb_enqueue(struct us
|
||||
@@ -842,6 +838,13 @@ static int dwc_otg_urb_enqueue(struct us
|
||||
&urb->transfer_dma, buf);
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
|
||||
--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
|
||||
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
|
||||
@@ -1813,7 +1813,7 @@ int fiq_fsm_queue_split_transaction(dwc_
|
||||
@@ -1811,7 +1811,7 @@ int fiq_fsm_queue_split_transaction(dwc_
|
||||
st->nr_errors = 0;
|
||||
|
||||
st->hcchar_copy.d32 = 0;
|
||||
|
@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
st->hcchar_copy.b.epdir = hc->ep_is_in;
|
||||
st->hcchar_copy.b.devaddr = hc->dev_addr;
|
||||
st->hcchar_copy.b.epnum = hc->ep_num;
|
||||
@@ -1858,7 +1858,7 @@ int fiq_fsm_queue_split_transaction(dwc_
|
||||
@@ -1856,7 +1856,7 @@ int fiq_fsm_queue_split_transaction(dwc_
|
||||
st->hctsiz_copy.b.pid = hc->data_pid_start;
|
||||
|
||||
if (hc->ep_is_in || (hc->xfer_len > hc->max_packet)) {
|
||||
|
|
Loading…
Reference in New Issue