Merge branch 'for-next/usb'

1 files changed, 42 insertions, 0 deletions

diff --git a/include/linux/usb/gadget-multi.h b/include/linux/usb/gadget-multi.h
new file mode 100644
index 0000000000..1027a10082
--- /dev/null
+++ b/include/linux/usb/gadget-multi.h
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __USB_GADGET_MULTI_H
+#define __USB_GADGET_MULTI_H
+
+#include <linux/types.h>
+#include <linux/usb/fastboot.h>
+#include <linux/usb/dfu.h>
+#include <linux/usb/usbserial.h>
+#include <linux/usb/mass_storage.h>
+
+struct f_multi_opts {
+	struct fastboot_opts fastboot_opts;
+	struct f_dfu_opts dfu_opts;
+	struct f_ums_opts ums_opts;
+	bool create_acm;
+	void (*release)(struct f_multi_opts *opts);
+};
+
+int usb_multi_register(struct f_multi_opts *opts);
+void usb_multi_unregister(void);
+void usb_multi_opts_release(struct f_multi_opts *opts);
+unsigned usb_multi_count_functions(struct f_multi_opts *opts);
+
+#define USBGADGET_EXPORT_BBU	(1 << 0)
+#define USBGADGET_ACM		(1 << 1)
+#define USBGADGET_DFU		(1 << 2)
+#define USBGADGET_FASTBOOT	(1 << 3)
+#define USBGADGET_MASS_STORAGE	(1 << 4)
+
+struct usbgadget_funcs {
+	int flags;
+	const char *fastboot_opts;
+	const char *dfu_opts;
+	const char *ums_opts;
+};
+
+int usbgadget_register(const struct usbgadget_funcs *funcs);
+
+void usbgadget_autostart(bool enable);
+
+#endif /* __USB_GADGET_MULTI_H */