summaryrefslogtreecommitdiff
path: root/target/linux/cns3xxx/patches-3.3/800-cns3xxx-dwc_otg.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/cns3xxx/patches-3.3/800-cns3xxx-dwc_otg.patch')
-rw-r--r--target/linux/cns3xxx/patches-3.3/800-cns3xxx-dwc_otg.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/800-cns3xxx-dwc_otg.patch b/target/linux/cns3xxx/patches-3.3/800-cns3xxx-dwc_otg.patch
new file mode 100644
index 0000000..ce15f7c
--- /dev/null
+++ b/target/linux/cns3xxx/patches-3.3/800-cns3xxx-dwc_otg.patch
@@ -0,0 +1,69 @@
+--- a/drivers/Makefile
++++ b/drivers/Makefile
+@@ -71,6 +71,7 @@ obj-$(CONFIG_PARIDE) += block/paride/
+ obj-$(CONFIG_TC) += tc/
+ obj-$(CONFIG_UWB) += uwb/
+ obj-$(CONFIG_USB_OTG_UTILS) += usb/
++obj-$(CONFIG_USB_DWC_OTG) += usb/dwc/
+ obj-$(CONFIG_USB) += usb/
+ obj-$(CONFIG_PCI) += usb/
+ obj-$(CONFIG_USB_GADGET) += usb/
+--- a/drivers/usb/Kconfig
++++ b/drivers/usb/Kconfig
+@@ -134,6 +134,8 @@ source "drivers/usb/musb/Kconfig"
+
+ source "drivers/usb/renesas_usbhs/Kconfig"
+
++source "drivers/usb/dwc/Kconfig"
++
+ source "drivers/usb/class/Kconfig"
+
+ source "drivers/usb/storage/Kconfig"
+--- a/drivers/usb/core/urb.c
++++ b/drivers/usb/core/urb.c
+@@ -17,7 +17,11 @@ static void urb_destroy(struct kref *kre
+
+ if (urb->transfer_flags & URB_FREE_BUFFER)
+ kfree(urb->transfer_buffer);
+-
++ if (urb->aligned_transfer_buffer) {
++ kfree(urb->aligned_transfer_buffer);
++ urb->aligned_transfer_buffer = 0;
++ urb->aligned_transfer_dma = 0;
++ }
+ kfree(urb);
+ }
+
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -1234,6 +1234,9 @@ struct urb {
+ unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/
+ void *transfer_buffer; /* (in) associated data buffer */
+ dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */
++ void *aligned_transfer_buffer; /* (in) associeated data buffer */
++ dma_addr_t aligned_transfer_dma;/* (in) dma addr for transfer_buffer */
++ u32 aligned_transfer_buffer_length; /* (in) data buffer length */
+ struct scatterlist *sg; /* (in) scatter gather buffer list */
+ int num_mapped_sgs; /* (internal) mapped sg entries */
+ int num_sgs; /* (in) number of entries in the sg list */
+--- a/drivers/usb/gadget/Kconfig
++++ b/drivers/usb/gadget/Kconfig
+@@ -125,6 +125,7 @@ config USB_GADGET_STORAGE_NUM_BUFFERS
+ #
+ choice
+ prompt "USB Peripheral Controller"
++ depends on !USB_DWC_OTG
+ help
+ A USB device uses a controller to talk to its host.
+ Systems should have only one such upstream link.
+--- a/drivers/usb/gadget/Makefile
++++ b/drivers/usb/gadget/Makefile
+@@ -3,7 +3,7 @@
+ #
+ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
+
+-obj-$(CONFIG_USB_GADGET) += udc-core.o
++#obj-$(CONFIG_USB_GADGET) += udc-core.o
+ obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o
+ obj-$(CONFIG_USB_NET2272) += net2272.o
+ obj-$(CONFIG_USB_NET2280) += net2280.o