dm: core: Create a new header file for 'compat' features

[oweals/u-boot.git] / drivers / usb / musb-new / musb_uboot.c

diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index d40772b1aa5c479c9570833cca10a44fa549c9a1..72f14b93438780411e7d2cd334443db9f8b51925 100644 (file)
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -1,6 +1,8 @@
 #include <common.h>
 #include <console.h>
+#include <malloc.h>
 #include <watchdog.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -110,7 +112,7 @@ static int _musb_submit_bulk_msg(struct musb_host_data *host,
 
 static int _musb_submit_int_msg(struct musb_host_data *host,
        struct usb_device *dev, unsigned long pipe,
-       void *buffer, int len, int interval)
+       void *buffer, int len, int interval, bool nonblock)
 {
        construct_urb(&host->urb, &host->hep, dev, USB_ENDPOINT_XFER_INT, pipe,
                      buffer, len, NULL, interval);
@@ -268,9 +270,10 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe,
 }
 
 int submit_int_msg(struct usb_device *dev, unsigned long pipe,
-                  void *buffer, int length, int interval)
+                  void *buffer, int length, int interval, bool nonblock)
 {
-       return _musb_submit_int_msg(&musb_host, dev, pipe, buffer, length, interval);
+       return _musb_submit_int_msg(&musb_host, dev, pipe, buffer, length,
+                                   interval, nonblock);
 }
 
 struct int_queue *create_int_queue(struct usb_device *dev,
@@ -320,10 +323,11 @@ static int musb_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,
 
 static int musb_submit_int_msg(struct udevice *dev, struct usb_device *udev,
                               unsigned long pipe, void *buffer, int length,
-                              int interval)
+                              int interval, bool nonblock)
 {
        struct musb_host_data *host = dev_get_priv(dev);
-       return _musb_submit_int_msg(host, udev, pipe, buffer, length, interval);
+       return _musb_submit_int_msg(host, udev, pipe, buffer, length, interval,
+                                   nonblock);
 }
 
 static struct int_queue *musb_create_int_queue(struct udevice *dev,
@@ -367,7 +371,7 @@ struct dm_usb_ops musb_usb_ops = {
 #endif /* CONFIG_IS_ENABLED(DM_USB) */
 #endif /* CONFIG_USB_MUSB_HOST */
 
-#ifdef CONFIG_USB_MUSB_GADGET
+#if defined(CONFIG_USB_MUSB_GADGET) && !CONFIG_IS_ENABLED(DM_USB_GADGET)
 static struct musb *gadget;
 
 int usb_gadget_handle_interrupts(int index)
@@ -430,7 +434,7 @@ struct musb *musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
                musbp = &musb_host.host;
                break;
 #endif
-#ifdef CONFIG_USB_MUSB_GADGET
+#if defined(CONFIG_USB_MUSB_GADGET) && !CONFIG_IS_ENABLED(DM_USB_GADGET)
        case MUSB_PERIPHERAL:
                musbp = &gadget;
                break;