Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / drivers / usb / gadget / s3c_udc_otg.c

diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 997d0ff860bb511d6bd0d15826b1c81aac02b87c..f9d24e3dfdc02ab6a613a3a1a1ad964bf364aad6 100644 (file)
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -30,14 +30,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-
+#undef DEBUG
 #include <common.h>
 #include <asm/errno.h>
 #include <linux/list.h>
 #include <malloc.h>
 
 #include <linux/usb/ch9.h>
-#include <usbdescriptors.h>
 #include <linux/usb/gadget.h>
 
 #include <asm/byteorder.h>
@@ -125,6 +124,19 @@ static void nuke(struct s3c_ep *ep, int status);
 static int s3c_udc_set_halt(struct usb_ep *_ep, int value);
 static void s3c_udc_set_nak(struct s3c_ep *ep);
 
+void set_udc_gadget_private_data(void *p)
+{
+       debug_cond(DEBUG_SETUP != 0,
+                  "%s: the_controller: 0x%p, p: 0x%p\n", __func__,
+                  the_controller, p);
+       the_controller->gadget.dev.device_data = p;
+}
+
+void *get_udc_gadget_private_data(struct usb_gadget *gadget)
+{
+       return gadget->dev.device_data;
+}
+
 static struct usb_ep_ops s3c_ep_ops = {
        .enable = s3c_ep_enable,
        .disable = s3c_ep_disable,