aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-09 14:48:51 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-09 14:48:51 +0000
commit16b4cbcdd64d92f6e79d41e11eda25a178ef3b53 (patch)
treebd75cb94a45491fc7adfc7874a0f794afe565cbc /target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch
parent1a57b05f472e60b05a8a4360718253820e8fece4 (diff)
downloadupstream-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.tar.gz
upstream-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.tar.bz2
upstream-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.zip
kernel: update linux 3.2 to 3.2.14
SVN-Revision: 31222
Diffstat (limited to 'target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch')
-rw-r--r--target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch17
1 files changed, 1 insertions, 16 deletions
diff --git a/target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch b/target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch
index f6d0015c76..507e99117a 100644
--- a/target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch
+++ b/target/linux/xburst/patches-3.2/0002-Add-jz4740-udc-driver.patch
@@ -17,8 +17,6 @@ History:
create mode 100644 drivers/usb/gadget/jz4740_udc.c
create mode 100644 drivers/usb/gadget/jz4740_udc.h
-diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
-index 23a4473..89b7d28 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -178,6 +178,14 @@ config USB_FUSB300
@@ -36,8 +34,6 @@ index 23a4473..89b7d28 100644
config USB_OMAP
tristate "OMAP USB Device Controller"
depends on ARCH_OMAP
-diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
-index b54ac61..2d65f6e 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_USB_PXA_U2O) += mv_udc.o
@@ -48,8 +44,6 @@ index b54ac61..2d65f6e 100644
#
# USB gadget drivers
-diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
-index a8855d0..99f1580 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -36,6 +36,7 @@
@@ -60,7 +54,7 @@ index a8855d0..99f1580 100644
#define gadget_is_langwell(g) (!strcmp("langwell_udc", (g)->name))
#define gadget_is_m66592(g) (!strcmp("m66592_udc", (g)->name))
#define gadget_is_musbhdrc(g) (!strcmp("musb-hdrc", (g)->name))
-@@ -118,6 +119,8 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
+@@ -118,6 +119,8 @@ static inline int usb_gadget_controller_
return 0x31;
else if (gadget_is_dwc3(gadget))
return 0x32;
@@ -69,9 +63,6 @@ index a8855d0..99f1580 100644
return -ENOENT;
}
-diff --git a/drivers/usb/gadget/jz4740_udc.c b/drivers/usb/gadget/jz4740_udc.c
-new file mode 100644
-index 0000000..8d36434
--- /dev/null
+++ b/drivers/usb/gadget/jz4740_udc.c
@@ -0,0 +1,2199 @@
@@ -2274,9 +2265,6 @@ index 0000000..8d36434
+MODULE_DESCRIPTION("JZ4740 USB Device Controller");
+MODULE_AUTHOR("Wei Jianli <jlwei@ingenic.cn>");
+MODULE_LICENSE("GPL");
-diff --git a/drivers/usb/gadget/jz4740_udc.h b/drivers/usb/gadget/jz4740_udc.h
-new file mode 100644
-index 0000000..53fd1da
--- /dev/null
+++ b/drivers/usb/gadget/jz4740_udc.h
@@ -0,0 +1,101 @@
@@ -2381,6 +2369,3 @@ index 0000000..53fd1da
+}
+
+#endif /* __USB_GADGET_JZ4740_H__ */
---
-1.7.5.4
-