Merge tag 'xilinx-for-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[oweals/u-boot.git] / drivers / usb / gadget / dwc2_udc_otg_priv.h

diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
index 1dcb277ad3e72d475e896af61c650ff641b704fd..e72b22ac61e1a9e9c70e64ba7baca549b5e407c9 100644 (file)
--- a/drivers/usb/gadget/dwc2_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -1,20 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Samsung S3C on-chip full/high speed USB device controllers
+ * Designware DWC2 on-chip full/high speed USB device controllers
  * Copyright (C) 2005 for Samsung Electronics
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __DWC2_UDC_OTG_PRIV__
 #define __DWC2_UDC_OTG_PRIV__
 
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/list.h>
-#include <usb/lin_gadget_compat.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 
 /*-------------------------------------------------------------------------*/
 /* DMA bounce buffer size, 16K is enough even for mass storage */
@@ -24,8 +22,7 @@
 #define EP_FIFO_SIZE           512
 #define EP_FIFO_SIZE2          1024
 /* ep0-control, ep1in-bulk, ep2out-bulk, ep3in-int */
-#define S3C_MAX_ENDPOINTS      4
-#define S3C_MAX_HW_ENDPOINTS   16
+#define DWC2_MAX_ENDPOINTS     4
 
 #define WAIT_FOR_SETUP          0
 #define DATA_STATE_XMIT         1
@@ -78,10 +75,10 @@ struct dwc2_udc {
        struct usb_gadget gadget;
        struct usb_gadget_driver *driver;
 
-       struct s3c_plat_otg_data *pdata;
+       struct dwc2_plat_otg_data *pdata;
 
        int ep0state;
-       struct dwc2_ep ep[S3C_MAX_ENDPOINTS];
+       struct dwc2_ep ep[DWC2_MAX_ENDPOINTS];
 
        unsigned char usb_address;