summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-17 21:46:04 -0500
committerTom Rini <trini@konsulko.com>2015-12-17 21:46:04 -0500
commit123b70177931a5aed92beca76bb622b2f4005be8 (patch)
tree83955f114744e2450e828ee5a183962287f43038 /include
parent9cddb4fe0266484aab9babdd2ebe650021644ea9 (diff)
parente4b70d80350c1238fa07872d71c19e3ddbf53b76 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
-rw-r--r--include/configs/bcm28155_ap.h2
-rw-r--r--include/configs/exynos4-common.h4
-rw-r--r--include/configs/s5p_goni.h4
-rw-r--r--include/configs/s5pc210_universal.h4
-rw-r--r--include/configs/smdkv310.h4
-rw-r--r--include/configs/socfpga_common.h2
-rw-r--r--include/usb/dwc2_udc.h25
-rw-r--r--include/usb/s3c_udc.h113
8 files changed, 35 insertions, 123 deletions
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 131f613b68..a257084a03 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -142,7 +142,7 @@
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 0
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG
#define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
#define CONFIG_USB_GADGET_DOWNLOAD
#define CONFIG_USBID_ADDR 0x34052c46
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index ec1f882f3a..d101a77473 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -51,8 +51,8 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#define CONFIG_USB_GADGET_DWC2_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG_PHY
#define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 2877e19ad4..8f65d7ed7a 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -269,8 +269,8 @@
#define CONFIG_SYS_MAX_I2C_BUS 7
#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#define CONFIG_USB_GADGET_DWC2_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG_PHY
#define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_CMD_USB_MASS_STORAGE
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 35fef2b244..7bb62ca6c1 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -177,8 +177,8 @@
#define CONFIG_POWER_MAX8998
#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#define CONFIG_USB_GADGET_DWC2_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG_PHY
#define CONFIG_USB_GADGET_DUALSPEED
/*
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 217cfc04ac..2492f99269 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -13,8 +13,8 @@
#undef CONFIG_BOARD_COMMON
#undef CONFIG_USB_GADGET
-#undef CONFIG_USB_GADGET_S3C_UDC_OTG
-#undef CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#undef CONFIG_USB_GADGET_DWC2_OTG
+#undef CONFIG_USB_GADGET_DWC2_OTG_PHY
#undef CONFIG_CMD_USB_MASS_STORAGE
#undef CONFIG_REVISION_TAG
#undef CONFIG_CMD_THOR_DOWNLOAD
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index b3f65b60d9..b0bc68952c 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -243,7 +243,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
*/
#if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG
#define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2
diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
new file mode 100644
index 0000000000..302e9a35a2
--- /dev/null
+++ b/include/usb/dwc2_udc.h
@@ -0,0 +1,25 @@
+/*
+ * drivers/usb/gadget/dwc2_udc.h
+ * Designware DWC2 on-chip full/high speed USB device controllers
+ * Copyright (C) 2005 for Samsung Electronics
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __DWC2_USB_GADGET
+#define __DWC2_USB_GADGET
+
+#define PHY0_SLEEP (1 << 5)
+
+struct dwc2_plat_otg_data {
+ int (*phy_control)(int on);
+ unsigned int regs_phy;
+ unsigned int regs_otg;
+ unsigned int usb_phy_ctrl;
+ unsigned int usb_flags;
+ unsigned int usb_gusbcfg;
+};
+
+int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata);
+
+#endif /* __DWC2_USB_GADGET */
diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
deleted file mode 100644
index 7f49a4e2d5..0000000000
--- a/include/usb/s3c_udc.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * drivers/usb/gadget/s3c_udc.h
- * Samsung S3C on-chip full/high speed USB device controllers
- * Copyright (C) 2005 for Samsung Electronics
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef __S3C_USB_GADGET
-#define __S3C_USB_GADGET
-
-#include <asm/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>
-
-#define PHY0_SLEEP (1 << 5)
-
-/*-------------------------------------------------------------------------*/
-/* DMA bounce buffer size, 16K is enough even for mass storage */
-#define DMA_BUFFER_SIZE (16*SZ_1K)
-
-#define EP0_FIFO_SIZE 64
-#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 WAIT_FOR_SETUP 0
-#define DATA_STATE_XMIT 1
-#define DATA_STATE_NEED_ZLP 2
-#define WAIT_FOR_OUT_STATUS 3
-#define DATA_STATE_RECV 4
-#define WAIT_FOR_COMPLETE 5
-#define WAIT_FOR_OUT_COMPLETE 6
-#define WAIT_FOR_IN_COMPLETE 7
-#define WAIT_FOR_NULL_COMPLETE 8
-
-#define TEST_J_SEL 0x1
-#define TEST_K_SEL 0x2
-#define TEST_SE0_NAK_SEL 0x3
-#define TEST_PACKET_SEL 0x4
-#define TEST_FORCE_ENABLE_SEL 0x5
-
-/* ************************************************************************* */
-/* IO
- */
-
-enum ep_type {
- ep_control, ep_bulk_in, ep_bulk_out, ep_interrupt
-};
-
-struct s3c_ep {
- struct usb_ep ep;
- struct s3c_udc *dev;
-
- const struct usb_endpoint_descriptor *desc;
- struct list_head queue;
- unsigned long pio_irqs;
- int len;
- void *dma_buf;
-
- u8 stopped;
- u8 bEndpointAddress;
- u8 bmAttributes;
-
- enum ep_type ep_type;
- int fifo_num;
-};
-
-struct s3c_request {
- struct usb_request req;
- struct list_head queue;
-};
-
-struct s3c_udc {
- struct usb_gadget gadget;
- struct usb_gadget_driver *driver;
-
- struct s3c_plat_otg_data *pdata;
-
- int ep0state;
- struct s3c_ep ep[S3C_MAX_ENDPOINTS];
-
- unsigned char usb_address;
-
- unsigned req_pending:1, req_std:1;
-};
-
-extern struct s3c_udc *the_controller;
-
-#define ep_is_in(EP) (((EP)->bEndpointAddress&USB_DIR_IN) == USB_DIR_IN)
-#define ep_index(EP) ((EP)->bEndpointAddress&0xF)
-#define ep_maxpacket(EP) ((EP)->ep.maxpacket)
-
-extern void otg_phy_init(struct s3c_udc *dev);
-extern void otg_phy_off(struct s3c_udc *dev);
-
-extern void s3c_udc_ep_set_stall(struct s3c_ep *ep);
-extern int s3c_udc_probe(struct s3c_plat_otg_data *pdata);
-
-struct s3c_plat_otg_data {
- int (*phy_control)(int on);
- unsigned int regs_phy;
- unsigned int regs_otg;
- unsigned int usb_phy_ctrl;
- unsigned int usb_flags;
- unsigned int usb_gusbcfg;
-};
-#endif