cns3xxx: update to linux 3.14
[openwrt/svn-archive/archive.git] / target / linux / cns3xxx / patches-3.14 / 200-dwc_otg_support.patch
1 --- a/drivers/usb/Kconfig
2 +++ b/drivers/usb/Kconfig
3 @@ -96,6 +96,8 @@ source "drivers/usb/host/Kconfig"
4
5 source "drivers/usb/renesas_usbhs/Kconfig"
6
7 +source "drivers/usb/dwc/Kconfig"
8 +
9 source "drivers/usb/class/Kconfig"
10
11 source "drivers/usb/storage/Kconfig"
12 --- a/drivers/usb/core/urb.c
13 +++ b/drivers/usb/core/urb.c
14 @@ -17,7 +17,11 @@ static void urb_destroy(struct kref *kre
15
16 if (urb->transfer_flags & URB_FREE_BUFFER)
17 kfree(urb->transfer_buffer);
18 -
19 + if (urb->aligned_transfer_buffer) {
20 + kfree(urb->aligned_transfer_buffer);
21 + urb->aligned_transfer_buffer = 0;
22 + urb->aligned_transfer_dma = 0;
23 + }
24 kfree(urb);
25 }
26
27 --- a/include/linux/usb.h
28 +++ b/include/linux/usb.h
29 @@ -1431,6 +1431,9 @@ struct urb {
30 unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/
31 void *transfer_buffer; /* (in) associated data buffer */
32 dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */
33 + void *aligned_transfer_buffer; /* (in) associeated data buffer */
34 + dma_addr_t aligned_transfer_dma;/* (in) dma addr for transfer_buffer */
35 + u32 aligned_transfer_buffer_length; /* (in) data buffer length */
36 struct scatterlist *sg; /* (in) scatter gather buffer list */
37 int num_mapped_sgs; /* (internal) mapped sg entries */
38 int num_sgs; /* (in) number of entries in the sg list */
39 --- a/drivers/usb/Makefile
40 +++ b/drivers/usb/Makefile
41 @@ -8,6 +8,7 @@ obj-$(CONFIG_USB) += core/
42
43 obj-$(CONFIG_USB_DWC3) += dwc3/
44 obj-$(CONFIG_USB_DWC2) += dwc2/
45 +obj-$(CONFIG_USB_DWC_OTG) += dwc/
46
47 obj-$(CONFIG_USB_MON) += mon/
48