usb: fix mtp on AOSP roms

Andrey0800770 · Jan 10, 2025 · b59b053 · b59b053
1 parent 3bcc137
commit b59b053
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/arch/arm64/configs/crownqlte_chn_open_defconfig b/arch/arm64/configs/crownqlte_chn_open_defconfig
@@ -4057,7 +4057,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_G_ANDROID=y
-CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
+#CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE is not set
 # CONFIG_USB_FFS_IPC_LOGGING is not set
 CONFIG_USB_NCM_SUPPORT_MTU_CHANGE=y
 

diff --git a/arch/arm64/configs/star2qlte_chn_open_defconfig b/arch/arm64/configs/star2qlte_chn_open_defconfig
@@ -4058,7 +4058,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_G_ANDROID=y
-CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
+#CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE is not set
 # CONFIG_USB_FFS_IPC_LOGGING is not set
 CONFIG_USB_NCM_SUPPORT_MTU_CHANGE=y
 

diff --git a/arch/arm64/configs/star2qlte_usa_single_defconfig b/arch/arm64/configs/star2qlte_usa_single_defconfig
@@ -4056,7 +4056,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_G_ANDROID=y
-CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
+#CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE is not set
 # CONFIG_USB_FFS_IPC_LOGGING is not set
 CONFIG_USB_NCM_SUPPORT_MTU_CHANGE=y
 

diff --git a/arch/arm64/configs/starqlte_chn_open_defconfig b/arch/arm64/configs/starqlte_chn_open_defconfig
@@ -4057,7 +4057,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_G_ANDROID=y
-CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
+#CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE is not set
 # CONFIG_USB_FFS_IPC_LOGGING is not set
 CONFIG_USB_NCM_SUPPORT_MTU_CHANGE=y
 

diff --git a/arch/arm64/configs/starqlte_usa_single_defconfig b/arch/arm64/configs/starqlte_usa_single_defconfig
@@ -4056,7 +4056,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_G_ANDROID=y
-CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
+#CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE is not set
 # CONFIG_USB_FFS_IPC_LOGGING is not set
 CONFIG_USB_NCM_SUPPORT_MTU_CHANGE=y
 

diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
@@ -48,11 +48,16 @@ obj-$(CONFIG_USB_F_PRINTER)	+= usb_f_printer.o
 usb_f_tcm-y			:= f_tcm.o
 obj-$(CONFIG_USB_F_TCM)		+= usb_f_tcm.o
 ifeq ($(CONFIG_SEC_FACTORY),y)
-	usb_f_mtp-y		:= f_mtp.o
-	obj-$(CONFIG_USB_F_MTP)	+= usb_f_mtp.o
+	usb_f_mtp-y             := f_mtp.o
+	obj-$(CONFIG_USB_F_MTP) += usb_f_mtp.o
 else
-	usb_f_mtp_samsung-y	:= f_mtp_samsung.o
-	obj-$(CONFIG_USB_F_MTP)	+= usb_f_mtp_samsung.o
+ifeq ($(CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE),y)
+	usb_f_mtp_samsung-y     := f_mtp_samsung.o
+	obj-$(CONFIG_USB_F_MTP) += usb_f_mtp_samsung.o
+else
+	usb_f_mtp-y             := f_mtp.o
+        obj-$(CONFIG_USB_F_MTP) += usb_f_mtp.o
+endif
 endif
 usb_f_ptp-y                     := f_ptp.o
 obj-$(CONFIG_USB_F_PTP)         += usb_f_ptp.o

diff --git a/drivers/usb/notify/usb_notifier_qcom.c b/drivers/usb/notify/usb_notifier_qcom.c
@@ -34,9 +34,9 @@
 extern int dwc_msm_vbus_event(bool enable);
 extern int dwc_msm_id_event(bool enable);
 extern void dwc3_max_speed_setting(int speed);
-
+#ifdef CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE
 extern void set_ncm_ready(bool ready);
-
+#endif
 #if defined(CONFIG_CCIC_NOTIFIER)
 int is_host;
 #endif
@@ -306,15 +306,15 @@ static int otg_accessory_power(bool enable)
 
 	return ret;
 }
-
 static int qcom_set_peripheral(bool enable)
 {
 	dwc_msm_vbus_event(enable);
+#ifdef CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE
 	if(!enable)
 		set_ncm_ready(false);
+#endif
 	return 0;
 }
-
 static int qcom_set_host(bool enable)
 {
 	dwc_msm_id_event(enable);