diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 386ed6343e33..598a67d6ba05 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -10,10 +10,3 @@ libcomposite-y			:= usbstring.o config.o epautoconf.o
 libcomposite-y			+= composite.o functions.o configfs.o u_f.o
 
 obj-$(CONFIG_USB_GADGET)	+= udc/ function/ legacy/
-
-usb_f_mtp-y			:= f_mtp.o
-obj-$(CONFIG_USB_F_MTP)		+= usb_f_mtp.o
-usb_f_ptp-y			:= f_ptp.o
-obj-$(CONFIG_USB_F_PTP)		+= usb_f_ptp.o
-usb_f_audio_source-y		:= f_audio_source.o
-obj-$(CONFIG_USB_F_AUDIO_SRC)	+= usb_f_audio_source.o
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
index bd7def576955..cbfd09c183ed 100644
--- a/drivers/usb/gadget/function/Makefile
+++ b/drivers/usb/gadget/function/Makefile
@@ -44,3 +44,9 @@ usb_f_hid-y			:= f_hid.o
 obj-$(CONFIG_USB_F_HID)		+= usb_f_hid.o
 usb_f_printer-y			:= f_printer.o
 obj-$(CONFIG_USB_F_PRINTER)	+= usb_f_printer.o
+usb_f_mtp-y                     := f_mtp.o
+obj-$(CONFIG_USB_F_MTP)         += usb_f_mtp.o
+usb_f_ptp-y                     := f_ptp.o
+obj-$(CONFIG_USB_F_PTP)         += usb_f_ptp.o
+usb_f_audio_source-y            := f_audio_source.o
+obj-$(CONFIG_USB_F_AUDIO_SRC)   += usb_f_audio_source.o
diff --git a/drivers/usb/gadget/f_audio_source.c b/drivers/usb/gadget/function/f_audio_source.c
similarity index 100%
rename from drivers/usb/gadget/f_audio_source.c
rename to drivers/usb/gadget/function/f_audio_source.c
diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c
similarity index 100%
rename from drivers/usb/gadget/f_mtp.c
rename to drivers/usb/gadget/function/f_mtp.c
diff --git a/drivers/usb/gadget/f_mtp.h b/drivers/usb/gadget/function/f_mtp.h
similarity index 100%
rename from drivers/usb/gadget/f_mtp.h
rename to drivers/usb/gadget/function/f_mtp.h
diff --git a/drivers/usb/gadget/f_ptp.c b/drivers/usb/gadget/function/f_ptp.c
similarity index 100%
rename from drivers/usb/gadget/f_ptp.c
rename to drivers/usb/gadget/function/f_ptp.c